Merge branch 'master' into cycles_disney_brdf
authorPascal Schoen <pascal_schoen@gmx.net>
Mon, 6 Feb 2017 10:32:31 +0000 (11:32 +0100)
committerPascal Schoen <pascal_schoen@gmx.net>
Mon, 6 Feb 2017 10:32:31 +0000 (11:32 +0100)
commit26e906d162a6a8d67f2ebc8880993fcbab69559e
treeedfea3cba91ca936f1b53b0923fb4789ab7776b8
parent0593b8c51bf7db0ed5ca92ed6f68d0d984dad0dd
parent223aff987aba127243658ab181dd473198a06aa5
Merge branch 'master' into cycles_disney_brdf
intern/cycles/blender/blender_shader.cpp
intern/cycles/render/nodes.cpp
source/blender/editors/space_node/drawnode.c
source/blender/gpu/shaders/gpu_shader_material.glsl
source/blender/makesrna/intern/rna_nodetree.c
source/blender/nodes/NOD_static_types.h