Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-02-02 14:48:18 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-02-02 14:50:56 +0300
commit49247f0fc445ec014478d485883492a04ae5facb (patch)
tree81cdf5ce77232b5538542c43cf4d617e795937d8 /source/blender/gpu/GPU_shader.h
parentbe10d6d3f046cc628824c372dd5f96d17cc95dbc (diff)
Fix T47207: Material shading incorrectly handles colorramp node
The issue was introduced by a fix for T44713 which only made GLSL consistent with Cycles. Now we do have conditional averaging or proper luma weighting based on whether we're new old old shading system. Not totally ideal but should work for until we re-design viewport possibly breaking how Blender Internal does implicit conversion.
Diffstat (limited to 'source/blender/gpu/GPU_shader.h')
-rw-r--r--source/blender/gpu/GPU_shader.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/source/blender/gpu/GPU_shader.h b/source/blender/gpu/GPU_shader.h
index 468cc2f0f6e..0317976f9d0 100644
--- a/source/blender/gpu/GPU_shader.h
+++ b/source/blender/gpu/GPU_shader.h
@@ -46,6 +46,7 @@ struct GPUTexture;
enum {
GPU_SHADER_FLAGS_NONE = 0,
GPU_SHADER_FLAGS_SPECIAL_OPENSUBDIV = (1 << 0),
+ GPU_SHADER_FLAGS_NEW_SHADING = (1 << 1),
};
GPUShader *GPU_shader_create(