diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-04-19 10:37:29 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-04-19 10:37:29 +0400 |
commit | 6a91cf9adb750810d942104cf6ce5fef5a7bf999 (patch) | |
tree | d76bb226a88765eeb76642a33cec34410b75824d /source/blender | |
parent | 217d1aa4613bb604b2da6364971965044592d35f (diff) |
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.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/editors/render/render_internal.c | 5 |
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; } |