diff options
-rw-r--r-- | source/blender/blenkernel/BKE_node.h | 1 | ||||
-rw-r--r-- | source/blender/nodes/shader/node_shader_tree.c | 27 |
2 files changed, 0 insertions, 28 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h index 42ed026cb01..1b229bce574 100644 --- a/source/blender/blenkernel/BKE_node.h +++ b/source/blender/blenkernel/BKE_node.h @@ -1067,7 +1067,6 @@ void BKE_nodetree_remove_layer_n(struct bNodeTree *ntree, struct bNodeTreeExec *ntreeShaderBeginExecTree(struct bNodeTree *ntree); void ntreeShaderEndExecTree(struct bNodeTreeExec *exec); -bool ntreeShaderExecTree(struct bNodeTree *ntree, int thread); struct bNode *ntreeShaderOutputNode(struct bNodeTree *ntree, int target); void ntreeGPUMaterialNodes(struct bNodeTree *localtree, diff --git a/source/blender/nodes/shader/node_shader_tree.c b/source/blender/nodes/shader/node_shader_tree.c index 3fb4d10979d..7b52b525541 100644 --- a/source/blender/nodes/shader/node_shader_tree.c +++ b/source/blender/nodes/shader/node_shader_tree.c @@ -1028,30 +1028,3 @@ void ntreeShaderEndExecTree(bNodeTreeExec *exec) ntree->execdata = NULL; } } - -/* TODO: left over from Blender Internal, could reuse for new texture nodes. */ -bool ntreeShaderExecTree(bNodeTree *ntree, int thread) -{ - ShaderCallData scd; - bNodeThreadStack *nts = NULL; - bNodeTreeExec *exec = ntree->execdata; - int compat; - - /* ensure execdata is only initialized once */ - if (!exec) { - BLI_thread_lock(LOCK_NODES); - if (!ntree->execdata) { - ntree->execdata = ntreeShaderBeginExecTree(ntree); - } - BLI_thread_unlock(LOCK_NODES); - - exec = ntree->execdata; - } - - nts = ntreeGetThreadStack(exec, thread); - compat = ntreeExecThreadNodes(exec, nts, &scd, thread); - ntreeReleaseThreadStack(nts); - - /* if compat is zero, it has been using non-compatible nodes */ - return compat; -} |