belle syncing
test
Merge branch 'master' of https://github.com/ydnality/Scene3D

Conflicts:
	pbrtHome.m
	scripts/pbrtFiles/benchScene_d_depth.exr
	scripts/s_s3dRenderBench.m
	scripts/s_s3dRenderCones.m