Merging r41093 through r41119 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 19 Oct 2011 21:37:07 +0000 (21:37 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 19 Oct 2011 21:37:07 +0000 (21:37 +0000)
This revision wouldn't compile, fix will came soon with codereview-related changes.

1  2 
release/scripts/startup/bl_ui/space_view3d.py
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenkernel/intern/node.c
source/blender/blenloader/intern/readfile.c
source/blender/makesrna/intern/rna_nodetree.c
source/blender/nodes/composite/node_composite_tree.c

Simple merge
index 74c6a090282b1c6b4c60ef5cb15c14b442ba7884,6f4939ecbdd00400bada6ccf71b74fcf82b2463b..45b1f296ab4ebfe1f97292bd065001e2350bd630
@@@ -812,13 -805,9 +817,13 @@@ int ntreeCompositTagAnimated(bNodeTree 
                /* here was tag render layer, but this is called after a render, so re-composites fail */
                else if(node->type==NODE_GROUP) {
                        if( ntreeCompositTagAnimated((bNodeTree *)node->id) ) {
-                               NodeTagChanged(ntree, node);
+                               nodeUpdate(ntree, node);
                        }
                }
 +              else if(ELEM(node->type, CMP_NODE_MOVIECLIP, CMP_NODE_TRANSFORM)) {
 +                      NodeTagChanged(ntree, node);
 +                      tagged= 1;
 +              }
        }
        
        return tagged;