noticed a problem with rendering non-active scenes in the node editor.

- the frame from the current scene wasn't used - whereas with rendering it is, set the current frame as is done when node rendering.
- camera switching also failed, added a call to it.

1 files changed, 5 insertions, 0 deletions

diff --git a/source/blender/editors/render/render_internal.c b/source/blender/editors/render/render_internal.c
index ddab9fae96f..71c88ae9e8f 100644
--- a/source/blender/editors/render/render_internal.c
+++ b/source/blender/editors/render/render_internal.c
@@ -54,6 +54,7 @@
 #include "BKE_report.h"
 #include "BKE_sequencer.h"
 #include "BKE_screen.h"
+#include "BKE_scene.h"
 
 #include "WM_api.h"
 #include "WM_types.h"
@@ -744,6 +745,10 @@ static int screen_render_invoke(bContext *C, wmOperator *op, wmEvent *event)
 		rl = (SceneRenderLayer *)BLI_findstring(&scene->r.layers, rl_name, offsetof(SceneRenderLayer, name));
 		
 		if (scn && rl) {
+			/* camera switch wont have updated */
+			scn->r.cfra= scene->r.cfra;
+			scene_camera_switch_update(scn);
+
 			scene = scn;
 			srl = rl;
 		}