Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.2.0 #27

Merged
merged 201 commits into from
Nov 24, 2016
Merged

v1.2.0 #27

merged 201 commits into from
Nov 24, 2016

Conversation

tatsy
Copy link
Owner

@tatsy tatsy commented Nov 24, 2016

Updating almost all the modules following PBRT v3.

…elopment

# Conflicts:
#	example/pathtracing_example.cc
#	src/bsdf/brdf.cc
#	src/bsdf/brdf.h
#	src/bsdf/bsdf.cc
#	src/bsdf/bsdf.h
#	src/camera/camera.h
#	src/core/vbo.cc
#	src/core/vbo.h
#	src/light/area_light.cc
#	src/light/area_light.h
#	src/light/envmap.cc
#	src/light/envmap.h
#	src/light/light_interface.h
#	src/light/lighting.cc
#	src/light/lighting.h
#	src/renderer/mlt.cc
#	src/renderer/pathtrace.cc
#	src/scenes/predefined_scenes.cc
#	src/scenes/scene.cc
#	src/scenes/scene.h
#	test/CMakeLists.txt
@tatsy tatsy merged commit a195f2c into master Nov 24, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant