[Bf-blender-cvs] [81e0973dec0] master: Cleanup: Remove unneeded texture nodes update function

Sergey Sharybin noreply at git.blender.org
Fri Apr 19 15:18:02 CEST 2019


Commit: 81e0973dec0085286ae2a80f6f8a8da896fb5b48
Author: Sergey Sharybin
Date:   Fri Apr 19 11:11:27 2019 +0200
Branches: master
https://developer.blender.org/rB81e0973dec0085286ae2a80f6f8a8da896fb5b48

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.

===================================================================

M	source/blender/blenkernel/BKE_node.h
M	source/blender/editors/screen/screen_edit.c
M	source/blender/nodes/texture/node_texture_tree.c

===================================================================

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)



More information about the Bf-blender-cvs mailing list