diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-02 14:48:18 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-02 14:50:56 +0300 |
commit | 49247f0fc445ec014478d485883492a04ae5facb (patch) | |
tree | 81cdf5ce77232b5538542c43cf4d617e795937d8 /source/blender/gpu/intern/gpu_codegen.h | |
parent | be10d6d3f046cc628824c372dd5f96d17cc95dbc (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/intern/gpu_codegen.h')
-rw-r--r-- | source/blender/gpu/intern/gpu_codegen.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_codegen.h b/source/blender/gpu/intern/gpu_codegen.h index 75102658c88..417e46a83ee 100644 --- a/source/blender/gpu/intern/gpu_codegen.h +++ b/source/blender/gpu/intern/gpu_codegen.h @@ -172,7 +172,9 @@ typedef struct GPUPass GPUPass; GPUPass *GPU_generate_pass(ListBase *nodes, struct GPUNodeLink *outlink, struct GPUVertexAttribs *attribs, int *builtin, - const GPUMatType type, const char *name, const bool use_opensubdiv); + const GPUMatType type, const char *name, + const bool use_opensubdiv, + const bool use_new_shading); struct GPUShader *GPU_pass_shader(GPUPass *pass); |