[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [28054] trunk/blender/source/blender/ editors/space_node: Brought back:
Ton Roosendaal
ton at blender.org
Tue Apr 6 19:47:21 CEST 2010
Revision: 28054
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=28054
Author: ton
Date: 2010-04-06 19:47:21 +0200 (Tue, 06 Apr 2010)
Log Message:
-----------
Brought back:
Node R-key: read scene layers (from temp buffers)
SHIFT+R: read full sample layers.
Modified Paths:
--------------
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/editors/space_node/node_intern.h
trunk/blender/source/blender/editors/space_node/node_ops.c
Modified: trunk/blender/source/blender/editors/space_node/node_edit.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_edit.c 2010-04-06 17:11:38 UTC (rev 28053)
+++ trunk/blender/source/blender/editors/space_node/node_edit.c 2010-04-06 17:47:21 UTC (rev 28054)
@@ -1649,11 +1649,11 @@
/* ******************************** */
// 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 @@
}
}
- // XXX snode_notify(snode);
+ snode_notify(C, snode);
+ return OPERATOR_FINISHED;
}
-void node_read_fullsamplelayers(SpaceNode *snode)
+void NODE_OT_read_renderlayers(wmOperatorType *ot)
{
- Scene *curscene= NULL; // XXX
+
+ 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;
+}
+
+static int node_read_fullsamplelayers_exec(bContext *C, wmOperator *op)
+{
+ 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);
- // allqueue(REDRAWNODE, 1);
- // allqueue(REDRAWIMAGE, 1);
+// WM_cursor_wait(0);
+ return OPERATOR_FINISHED;
+}
+
+
+void NODE_OT_read_fullsamplelayers(wmOperatorType *ot)
+{
- WM_cursor_wait(0);
+ ot->name= "Read Full Sample Layers";
+ ot->idname= "NODE_OT_read_fullsamplelayers";
+
+ 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;
Modified: trunk/blender/source/blender/editors/space_node/node_intern.h
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_intern.h 2010-04-06 17:11:38 UTC (rev 28053)
+++ trunk/blender/source/blender/editors/space_node/node_intern.h 2010-04-06 17:47:21 UTC (rev 28054)
@@ -103,6 +103,8 @@
void NODE_OT_show_cyclic_dependencies(struct wmOperatorType *ot);
void NODE_OT_link_viewer(struct wmOperatorType *ot);
+void NODE_OT_read_fullsamplelayers(struct wmOperatorType *ot);
+void NODE_OT_read_renderlayers(struct wmOperatorType *ot);
// XXXXXX
Modified: trunk/blender/source/blender/editors/space_node/node_ops.c
===================================================================
--- trunk/blender/source/blender/editors/space_node/node_ops.c 2010-04-06 17:11:38 UTC (rev 28053)
+++ trunk/blender/source/blender/editors/space_node/node_ops.c 2010-04-06 17:47:21 UTC (rev 28054)
@@ -71,6 +71,9 @@
WM_operatortype_append(NODE_OT_group_edit);
WM_operatortype_append(NODE_OT_link_viewer);
+
+ WM_operatortype_append(NODE_OT_read_renderlayers);
+ WM_operatortype_append(NODE_OT_read_fullsamplelayers);
}
void ED_operatormacros_node(void)
@@ -143,5 +146,8 @@
WM_keymap_add_item(keymap, "NODE_OT_group_ungroup", GKEY, KM_PRESS, KM_ALT, 0);
WM_keymap_add_item(keymap, "NODE_OT_group_edit", TABKEY, KM_PRESS, 0, 0);
+ WM_keymap_add_item(keymap, "NODE_OT_read_renderlayers", RKEY, KM_PRESS, 0, 0);
+ WM_keymap_add_item(keymap, "NODE_OT_read_fullsamplelayers", RKEY, KM_PRESS, KM_SHIFT, 0);
+
transform_keymap_for_space(keyconf, keymap, SPACE_NODE);
}
More information about the Bf-blender-cvs
mailing list