Small fix, report in IRC by Olivier:
authorTon Roosendaal <ton@blender.org>
Sun, 21 Aug 2011 13:25:19 +0000 (13:25 +0000)
committerTon Roosendaal <ton@blender.org>
Sun, 21 Aug 2011 13:25:19 +0000 (13:25 +0000)
Click in Compositor on output node invoked a re-composite.
Only has to be done for inactive outputs.

source/blender/editors/space_node/node_edit.c

index 9cafc46ca5307f6d0f14bc058d3229678a1a218a..011f9a31c93a785c42f6613ebb6ba99de94f7fbf 100644 (file)
@@ -550,14 +550,16 @@ void ED_node_set_active(Main *bmain, bNodeTree *ntree, bNode *node)
                                }
                        }
                        else if(node->type==CMP_NODE_COMPOSITE) {
-                               bNode *tnode;
-                               
-                               for(tnode= ntree->nodes.first; tnode; tnode= tnode->next)
-                                       if( tnode->type==CMP_NODE_COMPOSITE)
-                                               tnode->flag &= ~NODE_DO_OUTPUT;
-                               
-                               node->flag |= NODE_DO_OUTPUT;
-                               ED_node_generic_update(bmain, ntree, node);
+                               if (was_output==0) {
+                                       bNode *tnode;
+                                       
+                                       for(tnode= ntree->nodes.first; tnode; tnode= tnode->next)
+                                               if( tnode->type==CMP_NODE_COMPOSITE)
+                                                       tnode->flag &= ~NODE_DO_OUTPUT;
+                                       
+                                       node->flag |= NODE_DO_OUTPUT;
+                                       ED_node_generic_update(bmain, ntree, node);
+                               }
                        }
                }
                else if(ntree->type==NTREE_TEXTURE) {