Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2019-04-19 12:11:27 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2019-04-19 16:16:33 +0300
commit81e0973dec0085286ae2a80f6f8a8da896fb5b48 (patch)
treee09e8b973058e3c6d0d548b633e22b8a8c9eefe5
parentd892f1037c43e3d94b26f05d1e1947b62add2e58 (diff)
Cleanup: Remove unneeded texture nodes update function
The function was calling update() on the time curve, but there is no update callback on that node. So, effectively the function was doing nothing.
-rw-r--r--source/blender/blenkernel/BKE_node.h1
-rw-r--r--source/blender/editors/screen/screen_edit.c10
-rw-r--r--source/blender/nodes/texture/node_texture_tree.c22
3 files changed, 0 insertions, 33 deletions
diff --git a/source/blender/blenkernel/BKE_node.h b/source/blender/blenkernel/BKE_node.h
index 48b58562dd7..17ea7c8bada 100644
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@ -1220,7 +1220,6 @@ struct TexResult;
#define TEX_NODE_PROC_MAX 600
/* API */
-int ntreeTexTagAnimated(struct bNodeTree *ntree);
void ntreeTexCheckCyclics(struct bNodeTree *ntree);
struct bNodeTreeExec *ntreeTexBeginExecTree(struct bNodeTree *ntree);
diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index 259076f194f..8916577a33d 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -1451,16 +1451,6 @@ void ED_update_for_newframe(Main *bmain, Depsgraph *depsgraph)
/* composite */
if (scene->use_nodes && scene->nodetree)
ntreeCompositTagAnimated(scene->nodetree);
-
- /* update animated texture nodes */
- {
- Tex *tex;
- for (tex = bmain->textures.first; tex; tex = tex->id.next) {
- if (tex->use_nodes && tex->nodetree) {
- ntreeTexTagAnimated(tex->nodetree);
- }
- }
- }
}
/*
diff --git a/source/blender/nodes/texture/node_texture_tree.c b/source/blender/nodes/texture/node_texture_tree.c
index 76b906f5f22..519ae4fac9b 100644
--- a/source/blender/nodes/texture/node_texture_tree.c
+++ b/source/blender/nodes/texture/node_texture_tree.c
@@ -175,28 +175,6 @@ void register_node_tree_type_tex(void)
ntreeTypeAdd(tt);
}
-int ntreeTexTagAnimated(bNodeTree *ntree)
-{
- bNode *node;
-
- if (ntree == NULL)
- return 0;
-
- for (node = ntree->nodes.first; node; node = node->next) {
- if (node->type == TEX_NODE_CURVE_TIME) {
- nodeUpdate(ntree, node);
- return 1;
- }
- else if (node->type == NODE_GROUP) {
- if (ntreeTexTagAnimated((bNodeTree *)node->id)) {
- return 1;
- }
- }
- }
-
- return 0;
-}
-
bNodeTreeExec *ntreeTexBeginExecTree_internal(bNodeExecContext *context,
bNodeTree *ntree,
bNodeInstanceKey parent_key)