Merge branch 'cycles_disney_brdf' of git.blender.org:blender into cycles_disney_brdf

Browse Source

Conflicts:
	intern/cycles/kernel/closure/bsdf_disney_clearcoat.h
	intern/cycles/kernel/closure/bsdf_disney_diffuse.h
	intern/cycles/kernel/closure/bsdf_disney_specular.h
	intern/cycles/kernel/closure/bsdf_util.h
	intern/cycles/kernel/osl/CMakeLists.txt
	intern/cycles/kernel/osl/bsdf_disney_clearcoat.cpp
	intern/cycles/kernel/osl/bsdf_disney_diffuse.cpp
	intern/cycles/kernel/osl/bsdf_disney_specular.cpp
	intern/cycles/kernel/osl/osl_closures.h
	intern/cycles/kernel/shaders/node_disney_bsdf.osl
	intern/cycles/render/nodes.cpp
	intern/cycles/render/nodes.h

...

This commit is contained in:

Pascal Schön

2016-05-30 09:08:09 +02:00

parent 4f955d0523 6b5bab6cec

commit cee4fe0cc9

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available