diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2015-05-19 16:35:33 +0300 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2015-05-19 16:37:08 +0300 |
| commit | 78411dc7d77328e6c8fb7b38f7cacd186e68171e (patch) | |
| tree | 0681161a49806252814bbfff1c3ec5a230ef208e /source | |
| parent | dc3533030abe2f188316fee993b274d7f83df288 (diff) | |
Fix T44755 set_value node output in node tree not properly converted to
color in GLSL
Issue here is that intermediate result was clipped as an optimization in
such nodes and thus not converted to the correct type properly. Now only
clip those values if types match.
This keeps both the optimization and the conversion. I looked at
converting uniform types always but it's more involved to compare types
at conversion time for such links because the type was getting
overridden during link duplication.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/gpu/intern/gpu_codegen.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c index 90e4ce69394..8f07df5d3d1 100644 --- a/source/blender/gpu/intern/gpu_codegen.c +++ b/source/blender/gpu/intern/gpu_codegen.c @@ -930,8 +930,11 @@ static void gpu_node_input_link(GPUNode *node, GPUNodeLink *link, const GPUType if (link->output) { outnode = link->output->node; name = outnode->name; + input = outnode->inputs.first; - if (STREQ(name, "set_value") || STREQ(name, "set_rgb")) { + if ((STREQ(name, "set_value") || STREQ(name, "set_rgb")) && + (input->type == type)) + { input = MEM_dupallocN(outnode->inputs.first); input->type = type; if (input->link) |