Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 13 Feb 2019 18:02:43 +0000 (19:02 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Wed, 13 Feb 2019 18:02:43 +0000 (19:02 +0100)
commitdbd9b7590af7a3dde3805bf23f78a6e0c6b1fe99
tree8aa4b73de65bd84d91495abc3ece0e017e17cdfb
parentb54b14582bbd65103b5b052168dd8353e261d2ea
parentec559912fbcb51b713e1f33d4931af5fb52fd85b
Merge branch 'blender2.7'
intern/cycles/render/nodes.cpp
source/blender/gpu/shaders/gpu_shader_material.glsl
source/blender/nodes/shader/nodes/node_shader_hueSatVal.c