Merge branch 'cycles_disney_brdf' of git.blender.org:blender into cycles_disney_brdf
authorPascal Schoen <pascal_schoen@gmx.net>
Mon, 30 May 2016 07:08:09 +0000 (09:08 +0200)
committerPascal Schoen <pascal_schoen@gmx.net>
Mon, 30 May 2016 07:08:09 +0000 (09:08 +0200)
commitcee4fe0cc94515ee60d4afa4d4e10c41003f1579
tree2b9fb96313ed6c95aa01227a999d3d0b4cf4d616
parent4f955d052358206209454decf2c3539e6a21b42f
parent6b5bab6cecde153122625cf8dc10e4209ed1eb0f
Merge branch 'cycles_disney_brdf' of git.blender.org:blender into cycles_disney_brdf

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