[Bf-blender-cvs] [cee4fe0] cycles_disney_brdf: Merge branch 'cycles_disney_brdf' of git.blender.org:blender into cycles_disney_brdf

[Pascal Schoen]

Commit: cee4fe0cc94515ee60d4afa4d4e10c41003f1579
Author: Pascal Schoen
Date:   Mon May 30 09:08:09 2016 +0200
Branches: cycles_disney_brdf
https://developer.blender.org/rBcee4fe0cc94515ee60d4afa4d4e10c41003f1579

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

===================================================================



===================================================================