diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-24 19:39:19 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-04-24 19:39:19 +0400 |
| commit | 48b3dab64a2ccc5a344b46429df4803e7df4f155 (patch) | |
| tree | 9227fcad3122848f16a7e7cbd6b5ff3e4d292994 /source/blender | |
| parent | 9697493c77d93fff9fd739d617c46f5a09ea49a6 (diff) | |
Fix #35008: compositing nodes viewer border (ctrl + B) not working correct inside node groups.
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/editors/space_node/drawnode.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/space_node/node_edit.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index c1d1c1a993f..d326bd6eca5 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -2928,7 +2928,7 @@ void draw_nodespace_back_pix(const bContext *C, ARegion *ar, SpaceNode *snode) /** @note draw selected info on backdrop */ if (snode->edittree) { bNode *node = snode->edittree->nodes.first; - rctf *viewer_border = &snode->edittree->viewer_border; + rctf *viewer_border = &snode->nodetree->viewer_border; while (node) { if (node->flag & NODE_SELECT) { if (node->typeinfo->uibackdropfunc) { @@ -2938,7 +2938,7 @@ void draw_nodespace_back_pix(const bContext *C, ARegion *ar, SpaceNode *snode) node = node->next; } - if ((snode->edittree->flag & NTREE_VIEWER_BORDER) && + if ((snode->nodetree->flag & NTREE_VIEWER_BORDER) && viewer_border->xmin < viewer_border->xmax && viewer_border->ymin < viewer_border->ymax) { diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 25b2180dbb1..bf4a41e35c3 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -2422,7 +2422,7 @@ static int viewer_border_exec(bContext *C, wmOperator *op) if (ibuf) { ARegion *ar = CTX_wm_region(C); SpaceNode *snode = CTX_wm_space_node(C); - bNodeTree *btree = snode->edittree; + bNodeTree *btree = snode->nodetree; rcti rect; rctf rectf; |