diff options
Diffstat (limited to 'source/blender/nodes')
| -rw-r--r-- | source/blender/nodes/shader/node_shader_tree.c | 8 | ||||
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_dynamic.c | 8 | ||||
| -rw-r--r-- | source/blender/nodes/shader/nodes/node_shader_output.c | 6 |
3 files changed, 13 insertions, 9 deletions
diff --git a/source/blender/nodes/shader/node_shader_tree.c b/source/blender/nodes/shader/node_shader_tree.c index e4f21a474c0..e12ac4dee49 100644 --- a/source/blender/nodes/shader/node_shader_tree.c +++ b/source/blender/nodes/shader/node_shader_tree.c @@ -248,10 +248,10 @@ void ntreeShaderEndExecTree(bNodeTreeExec *exec, int use_tree_data) void ntreeShaderExecTree(bNodeTree *ntree, ShadeInput *shi, ShadeResult *shr) { ShaderCallData scd; - /* - \note: preserve material from ShadeInput for material id, nodetree execs change it - fix for bug "[#28012] Mat ID messy with shader nodes" - */ + /** + * \note: preserve material from ShadeInput for material id, nodetree execs change it + * fix for bug "[#28012] Mat ID messy with shader nodes" + */ Material *mat = shi->mat; bNodeThreadStack *nts = NULL; bNodeTreeExec *exec = ntree->execdata; diff --git a/source/blender/nodes/shader/nodes/node_shader_dynamic.c b/source/blender/nodes/shader/nodes/node_shader_dynamic.c index e55b1b164df..0c6c53b38e4 100644 --- a/source/blender/nodes/shader/nodes/node_shader_dynamic.c +++ b/source/blender/nodes/shader/nodes/node_shader_dynamic.c @@ -654,7 +654,7 @@ static void node_dynamic_setup(bNode *node) * 0: for loaded empty nodes * NODE_DYNAMIC_MENU: for the default Dynamic node type * > NODE_DYNAMIC_MENU: for the new types defined by scripts -*/ + */ static void node_dynamic_init_cb(bNode *node) { int type = node->custom2; @@ -718,8 +718,10 @@ static void node_dynamic_exec_cb(void *data, bNode *node, bNodeStack **in, bNode if (!node->id) return; - /*if (G.scene->r.threads > 1) - return;*/ +#if 0 + if (G.scene->r.threads > 1) + return; +#endif if (BTST2(node->custom1, NODE_DYNAMIC_NEW, NODE_DYNAMIC_REPARSE)) { node_dynamic_setup(node); diff --git a/source/blender/nodes/shader/nodes/node_shader_output.c b/source/blender/nodes/shader/nodes/node_shader_output.c index 4a4a2010d59..8b0e9a5803b 100644 --- a/source/blender/nodes/shader/nodes/node_shader_output.c +++ b/source/blender/nodes/shader/nodes/node_shader_output.c @@ -69,8 +69,10 @@ static int gpu_shader_output(GPUMaterial *mat, bNode *UNUSED(node), GPUNodeStack { GPUNodeLink *outlink; - /*if(in[1].hasinput) - GPU_material_enable_alpha(mat);*/ +#if 0 + if(in[1].hasinput) + GPU_material_enable_alpha(mat); +#endif GPU_stack_link(mat, "output_node", in, out, &outlink); GPU_material_output_link(mat, outlink); |