novalain / gi-ray

A Monte-Carlo ray tracer from scratch in C++
5 stars 1 forks source link

Fixed light color. Think its correct now #97

Closed Carlbaum closed 8 years ago

Carlbaum commented 8 years ago

I asked for pull request after merging your previous pull request with master.. and there were no conflicts.. but I still had to update this branch.. weird?! So I pressed the "Update branch" button here.. and now there's a merge commit.. Squash & rebase & merge?

novalain commented 8 years ago

It's a setting ;)

Require branches to be up to date before merging This ensures the branch has been tested with the latest code on master.