Brought back:

Node R-key: read scene layers (from temp buffers)
     SHIFT+R: read full sample layers.

3 files changed, 52 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;
diff --git a/source/blender/editors/space_node/node_intern.h b/source/blender/editors/space_node/node_intern.h
index 6f7638a1f14..f1a27f934cb 100644
--- a/source/blender/editors/space_node/node_intern.h
+++ b/source/blender/editors/space_node/node_intern.h
@@ -103,6 +103,8 @@ void NODE_OT_hide(struct wmOperatorType *ot);
 
 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
diff --git a/source/blender/editors/space_node/node_ops.c b/source/blender/editors/space_node/node_ops.c
index 6566f2f184d..594c25f9911 100644
--- a/source/blender/editors/space_node/node_ops.c
+++ b/source/blender/editors/space_node/node_ops.c
@@ -71,6 +71,9 @@ void node_operatortypes(void)
 	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 @@ void node_keymap(struct wmKeyConfig *keyconf)
 	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);
 }