[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36218] trunk/blender/source/blender/ editors/render/render_internal.c: noticed a problem with rendering non-active scenes in the node editor.

Campbell Barton ideasman42 at gmail.com
Tue Apr 19 08:37:29 CEST 2011


Revision: 36218
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36218
Author:   campbellbarton
Date:     2011-04-19 06:37:29 +0000 (Tue, 19 Apr 2011)
Log Message:
-----------
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.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/render/render_internal.c

Modified: trunk/blender/source/blender/editors/render/render_internal.c
===================================================================
--- trunk/blender/source/blender/editors/render/render_internal.c	2011-04-19 06:15:13 UTC (rev 36217)
+++ trunk/blender/source/blender/editors/render/render_internal.c	2011-04-19 06:37:29 UTC (rev 36218)
@@ -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 @@
 		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;
 		}




More information about the Bf-blender-cvs mailing list