[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36657] branches/particles-2010/source/ blender: Bug in tree localization: need_exec must only be reset for compositor trees.

[Lukas Toenne]

Revision: 36657
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36657
Author:   lukastoenne
Date:     2011-05-13 06:52:51 +0000 (Fri, 13 May 2011)
Log Message:
-----------
Bug in tree localization: need_exec must only be reset for compositor trees.

Modified Paths:
--------------
    branches/particles-2010/source/blender/blenkernel/intern/node.c
    branches/particles-2010/source/blender/nodes/composite/node_composite_tree.c

Modified: branches/particles-2010/source/blender/blenkernel/intern/node.c
===================================================================
--- branches/particles-2010/source/blender/blenkernel/intern/node.c     
2011-05-13 05:45:18 UTC (rev 36656)
+++ branches/particles-2010/source/blender/blenkernel/intern/node.c     
2011-05-13 06:52:51 UTC (rev 36657)
@@ -1130,11 +1130,8 @@
        ntreeSetOutput(ntree);
 
        for(node= ntree->nodes.first; node; node= node->next) {
-               
                /* store new_node pointer to original */
                node->new_node->new_node= node;
-               /* ensure new user input gets handled ok */
-               node->need_exec= 0;
        }
 
        if (ntreetype->localize)

Modified: 
branches/particles-2010/source/blender/nodes/composite/node_composite_tree.c
===================================================================
--- 
branches/particles-2010/source/blender/nodes/composite/node_composite_tree.c    
    2011-05-13 05:45:18 UTC (rev 36656)
+++ 
branches/particles-2010/source/blender/nodes/composite/node_composite_tree.c    
    2011-05-13 06:52:51 UTC (rev 36657)
@@ -105,6 +105,9 @@
        bNodeSocket *sock;
        
        for(node= ntree->nodes.first; node; node= node->next) {
+               /* ensure new user input gets handled ok */
+               node->need_exec= 0;
+               
                /* move over the compbufs */
                /* right after ntreeCopyTree() oldsock pointers are valid */
                
@@ -118,7 +121,6 @@
                }
                
                for(sock= node->outputs.first; sock; sock= sock->next) {
-                       
                        sock->new_sock->cache= sock->cache;
                        compbuf_set_node(sock->new_sock->cache, node->new_node);
                        

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs