diff options
Diffstat (limited to 'source/blender/editors/space_node')
| -rw-r--r-- | source/blender/editors/space_node/drawnode.c | 14 | ||||
| -rw-r--r-- | source/blender/editors/space_node/node_edit.c | 10 |
2 files changed, 14 insertions, 10 deletions
diff --git a/source/blender/editors/space_node/drawnode.c b/source/blender/editors/space_node/drawnode.c index 61c53fb58d3..2dd0fec126b 100644 --- a/source/blender/editors/space_node/drawnode.c +++ b/source/blender/editors/space_node/drawnode.c @@ -899,8 +899,9 @@ static char *layer_menu(RenderResult *rr) static void image_layer_cb(bContext *C, void *ima_v, void *iuser_v) { + Scene *scene= CTX_data_scene(C); - ntreeCompositForceHidden(G.scene->nodetree); + ntreeCompositForceHidden(scene->nodetree, scene); BKE_image_multilayer_index(ima_v, iuser_v); // allqueue(REDRAWNODE, 0); } @@ -1030,7 +1031,7 @@ static void set_render_layers_title(bContext *C, void *node_v, void *unused) } else { str[0]= 0; - sce= G.scene; + sce= CTX_data_scene(C); } srl= BLI_findlink(&sce->r.layers, node->custom1); if(srl==NULL) { @@ -1071,7 +1072,7 @@ static void node_browse_scene_cb(bContext *C, void *ntree_v, void *node_v) node->id= NULL; } sce= BLI_findlink(&G.main->scene, node->menunr-1); - if(sce!=G.scene) { + if(sce!=CTX_data_scene(C)) { node->id= &sce->id; id_us_plus(node->id); } @@ -1090,6 +1091,7 @@ static void node_browse_scene_cb(bContext *C, void *ntree_v, void *node_v) static int node_composit_buts_renderlayers(uiBlock *block, bNodeTree *ntree, bNode *node, rctf *butr) { if(block) { + Scene *scene= NULL; // XXX CTX_data_scene(C) can't work here. node->id has to be set default (ton) uiBut *bt; char *strp; @@ -1104,7 +1106,7 @@ static int node_composit_buts_renderlayers(uiBlock *block, bNodeTree *ntree, bNo if(strp) MEM_freeN(strp); /* browse button layer */ - strp= scene_layer_menu(node->id?(Scene *)node->id:G.scene); + strp= scene_layer_menu(node->id?(Scene *)node->id:scene); if(node->id) bt= uiDefIconTextButS(block, MENU, B_NODE_EXEC+node->nr, ICON_SCENE_DEHLT, strp, butr->xmin+20, butr->ymin, (butr->xmax-butr->xmin)-40, 19, @@ -1958,9 +1960,9 @@ static void node_scale_cb(bContext *C, void *node_v, void *unused_v) nsock->ns.vec[0]= 1.0; else { if(nsock->next==NULL) - nsock->ns.vec[0]= (float)G.scene->r.ysch; + nsock->ns.vec[0]= (float)CTX_data_scene(C)->r.ysch; else - nsock->ns.vec[0]= (float)G.scene->r.xsch; + nsock->ns.vec[0]= (float)CTX_data_scene(C)->r.xsch; } } } diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 7ed00c722d9..fc12e14efe4 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -590,13 +590,13 @@ void snode_set_context(SpaceNode *snode, Scene *scene) } else if(snode->treetype==NTREE_COMPOSIT) { snode->from= NULL; - snode->id= &G.scene->id; + snode->id= &scene->id; /* bit clumsy but reliable way to see if we draw first time */ if(snode->nodetree==NULL) - ntreeCompositForceHidden(G.scene->nodetree); + ntreeCompositForceHidden(scene->nodetree, scene); - snode->nodetree= G.scene->nodetree; + snode->nodetree= scene->nodetree; } else if(snode->treetype==NTREE_TEXTURE) { if(ob) { @@ -915,6 +915,7 @@ bNode *next_node(bNodeTree *ntree) return NULL; } +#if 0 /* is rct in visible part of node? */ static bNode *visible_node(SpaceNode *snode, rctf *rct) { @@ -926,6 +927,7 @@ static bNode *visible_node(SpaceNode *snode, rctf *rct) } return tnode; } +#endif void snode_home(ScrArea *sa, ARegion *ar, SpaceNode* snode) { @@ -1813,7 +1815,7 @@ bNode *node_add_node(SpaceNode *snode, int type, float locx, float locy) id_us_plus(node->id); if(snode->nodetree->type==NTREE_COMPOSIT) - ntreeCompositForceHidden(snode->edittree); + ntreeCompositForceHidden(snode->edittree, scene); // XXX was G.scene NodeTagChanged(snode->edittree, node); } |