Merge branch 'blender2.7'
authorBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 14 Feb 2019 19:00:37 +0000 (20:00 +0100)
committerBrecht Van Lommel <brechtvanlommel@gmail.com>
Thu, 14 Feb 2019 19:00:37 +0000 (20:00 +0100)
commit7a41c1634ba8099f1b4b94570edf8df2cf87da7a
treefce5cf38de95ffe1df4d02108dfca8c7a960fb7c
parent349357a7bdffcf82705598d3cfc203812dd6d9a3
parentde0e456a6c7d6da065d275104bc2022b69874648
Merge branch 'blender2.7'
source/blender/gpu/shaders/gpu_shader_material.glsl
source/blender/nodes/shader/nodes/node_shader_hueSatVal.c