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:
authorLukas Toenne <lukas.toenne@googlemail.com>2011-09-07 17:30:16 +0400
committerLukas Toenne <lukas.toenne@googlemail.com>2011-09-07 17:30:16 +0400
commit3f565fc2120f69b8ddeed077461b522103be2f3b (patch)
tree0b592e42a453dc29a8bfecd884cc688cc660b7eb /source/blender/editors
parent7db716599cd939cee4cc574e02ecd1468bb40b94 (diff)
Updating render layer and image output sockets was not working due to changes in snode_set_context. Before the r39941 this used a hack to 'test for first drawing', but since the snode->nodetree was set to NULL each time at the start of that function the condition would always evaluate true anyway. Simply removed that check to restore previous behavior.
Diffstat (limited to 'source/blender/editors')
-rw-r--r--source/blender/editors/space_node/node_edit.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c
index b5633d50997..43f8a071597 100644
--- a/source/blender/editors/space_node/node_edit.c
+++ b/source/blender/editors/space_node/node_edit.c
@@ -447,9 +447,8 @@ void snode_set_context(SpaceNode *snode, Scene *scene)
else if(snode->treetype==NTREE_COMPOSIT) {
snode->id= &scene->id;
- /* bit clumsy but reliable way to see if we draw first time */
- if(snode->nodetree==NULL)
- ntreeCompositForceHidden(scene->nodetree, scene);
+ /* update output sockets based on available layers */
+ ntreeCompositForceHidden(scene->nodetree, scene);
}
else if(snode->treetype==NTREE_TEXTURE) {
Tex *tx= NULL;