diff options
author | Ton Roosendaal <ton@blender.org> | 2010-04-06 21:47:21 +0400 |
---|---|---|
committer | Ton Roosendaal <ton@blender.org> | 2010-04-06 21:47:21 +0400 |
commit | 6996d7b032b7222278d2c30eded7c81c763a7021 (patch) | |
tree | 3a4e79811eb74d881ac76ce2ffa14b8b83108b0c /source/blender/editors/space_node/node_edit.c | |
parent | 2a1644401e2866fa51027390fa605d840842649d (diff) |
Brought back:
Node R-key: read scene layers (from temp buffers)
SHIFT+R: read full sample layers.
Diffstat (limited to 'source/blender/editors/space_node/node_edit.c')
-rw-r--r-- | source/blender/editors/space_node/node_edit.c | 57 |
1 files changed, 44 insertions, 13 deletions
diff --git a/source/blender/editors/space_node/node_edit.c b/source/blender/editors/space_node/node_edit.c index 246806ecec9..a7fe1b34d50 100644 --- a/source/blender/editors/space_node/node_edit.c +++ b/source/blender/editors/space_node/node_edit.c @@ -1649,11 +1649,11 @@ void NODE_OT_links_cut(wmOperatorType *ot) /* ******************************** */ // XXX some code needing updating to operators... -/* goes over all scenes, reads render layerss */ -void node_read_renderlayers(SpaceNode *snode) +/* goes over all scenes, reads render layers */ +static int node_read_renderlayers_exec(bContext *C, wmOperator *op) { - Scene *curscene= NULL; // XXX - Scene *scene; + SpaceNode *snode= CTX_wm_space_node(C); + Scene *curscene= CTX_data_scene(C), *scene; bNode *node; /* first tag scenes unread */ @@ -1671,26 +1671,57 @@ void node_read_renderlayers(SpaceNode *snode) } } - // XXX snode_notify(snode); + snode_notify(C, snode); + return OPERATOR_FINISHED; +} + +void NODE_OT_read_renderlayers(wmOperatorType *ot) +{ + + ot->name= "Read Render Layers"; + ot->idname= "NODE_OT_read_renderlayers"; + + ot->exec= node_read_renderlayers_exec; + + ot->poll= ED_operator_node_active; + + /* flags */ + ot->flag= 0; } -void node_read_fullsamplelayers(SpaceNode *snode) +static int node_read_fullsamplelayers_exec(bContext *C, wmOperator *op) { - Scene *curscene= NULL; // XXX + SpaceNode *snode= CTX_wm_space_node(C); + Scene *curscene= CTX_data_scene(C); Render *re= RE_NewRender(curscene->id.name); - WM_cursor_wait(1); +// WM_cursor_wait(1); - //BIF_init_render_callbacks(re, 1); RE_MergeFullSample(re, curscene, snode->nodetree); - //BIF_end_render_callbacks(); + snode_notify(C, snode); + +// WM_cursor_wait(0); + return OPERATOR_FINISHED; +} + + +void NODE_OT_read_fullsamplelayers(wmOperatorType *ot) +{ - // allqueue(REDRAWNODE, 1); - // allqueue(REDRAWIMAGE, 1); + ot->name= "Read Full Sample Layers"; + ot->idname= "NODE_OT_read_fullsamplelayers"; - WM_cursor_wait(0); + ot->exec= node_read_fullsamplelayers_exec; + + ot->poll= ED_operator_node_active; + + /* flags */ + ot->flag= 0; } + +/* ************************* */ + void imagepaint_composite_tags(bNodeTree *ntree, Image *image, ImageUser *iuser) { bNode *node; |