diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-02-14 18:11:19 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2014-02-14 18:11:58 +0400 |
| commit | a252e27fec16e09efe873a6bbbd29b3ad5d4c67f (patch) | |
| tree | f5f98df5363c83acdc51b911f55261f5fe334f9c /source/blender/nodes/shader/node_shader_util.c | |
| parent | 8439a165ff50a6b3f690c04347aae8a253e08ca2 (diff) | |
Fix T38633: glsl not working well with mixed cycles/blender material nodes.
Diffstat (limited to 'source/blender/nodes/shader/node_shader_util.c')
| -rw-r--r-- | source/blender/nodes/shader/node_shader_util.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/nodes/shader/node_shader_util.c b/source/blender/nodes/shader/node_shader_util.c index 86e59cd779a..8e83140733a 100644 --- a/source/blender/nodes/shader/node_shader_util.c +++ b/source/blender/nodes/shader/node_shader_util.c @@ -219,7 +219,7 @@ bNode *nodeGetActiveTexture(bNodeTree *ntree) return inactivenode; } -void ntreeExecGPUNodes(bNodeTreeExec *exec, GPUMaterial *mat, int do_outputs) +void ntreeExecGPUNodes(bNodeTreeExec *exec, GPUMaterial *mat, int do_outputs, short compatibility) { bNodeExec *nodeexec; bNode *node; @@ -238,8 +238,9 @@ void ntreeExecGPUNodes(bNodeTreeExec *exec, GPUMaterial *mat, int do_outputs) do_it = FALSE; /* for groups, only execute outputs for edited group */ if (node->typeinfo->nclass == NODE_CLASS_OUTPUT) { - if (do_outputs && (node->flag & NODE_DO_OUTPUT)) - do_it = TRUE; + if (node->typeinfo->compatibility & compatibility) + if (do_outputs && (node->flag & NODE_DO_OUTPUT)) + do_it = TRUE; } else do_it = TRUE; |