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:
authorJoshua Leung <aligorith@gmail.com>2011-03-11 06:27:38 +0300
committerJoshua Leung <aligorith@gmail.com>2011-03-11 06:27:38 +0300
commitffb4cf6b322ed66871e3e88b17075ae0f3ffbf69 (patch)
tree7026b6264dc76052e6c1d134951c153bfae57996 /source/blender/editors/space_node/node_draw.c
parentdec585cb945e239764925f4eb6282e9652fdc806 (diff)
Bugfix [#26167] Animating inside group nodes behaves strangely
One node update call (for nodes within group nodetrees) was using the wrong nodetree (node-editor's nodetree, not the group) which meant that the wrong RNA context for such nodes would get used, resulting in errors when trying to keyframe such nodes. Hopefully this is the last time I have to fix these bugs...
Diffstat (limited to 'source/blender/editors/space_node/node_draw.c')
-rw-r--r--source/blender/editors/space_node/node_draw.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_node/node_draw.c b/source/blender/editors/space_node/node_draw.c
index ebbb33631a9..81585923728 100644
--- a/source/blender/editors/space_node/node_draw.c
+++ b/source/blender/editors/space_node/node_draw.c
@@ -284,7 +284,7 @@ static void node_update(const bContext *C, bNodeTree *ntree, bNode *node)
node->butr.xmax= node->width - 2*NODE_DYS;
node->butr.ymin= 0;
node->butr.ymax= 0;
-
+
RNA_pointer_create(&ntree->id, &RNA_Node, node, &ptr);
layout= uiBlockLayout(node->block, UI_LAYOUT_VERTICAL, UI_LAYOUT_PANEL,
@@ -406,7 +406,7 @@ static void node_update_group(const bContext *C, bNodeTree *ntree, bNode *gnode)
if(node->flag & NODE_HIDDEN)
node_update_hidden(node);
else
- node_update(C, ntree, node);
+ node_update(C, ngroup, node);
node->locx-= gnode->locx;
node->locy-= gnode->locy;
}