Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJanne Karhu <jhkarh@gmail.com>2011-01-28 16:14:01 +0300
committerJanne Karhu <jhkarh@gmail.com>2011-01-28 16:14:01 +0300
commit73f48ef3f83332deb0fb19da85e2aae9248b9b51 (patch)
treea848c892c37961b148a567dbc00d1b223e40e29d /source/blender/blenkernel/intern/sequencer.c
parent7769c003853a5238135b763c748ed8db2b77b4d9 (diff)
Fix for [#25843] Multiple Scene Strip in Sequencer, bad scrubbing for armatures in viewport
* Sequencer didn't restore the scene properly after drawing a frame other than the current frame.
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
-rw-r--r--source/blender/blenkernel/intern/sequencer.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index 973f14d690c..beda03e2257 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -1952,6 +1952,8 @@ static ImBuf * seq_render_scene_strip_impl(
seq->scene->r.cfra = oldcfra;
seq->scene->camera= oldcamera;
+ if(frame != oldcfra)
+ scene_update_for_newframe(context.bmain, seq->scene, seq->scene->lay);
#ifdef DURIAN_CAMERA_SWITCH
/* stooping to new low's in hackyness :( */