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:
authorSergey Sharybin <sergey.vfx@gmail.com>2012-12-12 15:12:37 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2012-12-12 15:12:37 +0400
commit0ec099f2828921c6aa69987c9bfe51a4971a8c5d (patch)
tree54b9a489ec07d21965211f4358e29c3df41331f9 /source/blender/blenkernel/intern/sequencer.c
parentdd2d54bae9ab2b95553c7c3ed04185fcf36a0420 (diff)
Sequencer old todo: inserting keyframes with preview opened didn't work
Solved in more like a workaround way by not calling BKE_scene_update_for_newframe if scene's frame didn't change.
Diffstat (limited to 'source/blender/blenkernel/intern/sequencer.c')
-rw-r--r--source/blender/blenkernel/intern/sequencer.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/sequencer.c b/source/blender/blenkernel/intern/sequencer.c
index acce3740c98..ea8c60c1eab 100644
--- a/source/blender/blenkernel/intern/sequencer.c
+++ b/source/blender/blenkernel/intern/sequencer.c
@@ -2408,7 +2408,8 @@ static ImBuf *seq_render_scene_strip(SeqRenderData context, Sequence *seq, float
context.scene->r.seq_prev_type = 3 /* == OB_SOLID */;
/* opengl offscreen render */
- BKE_scene_update_for_newframe(context.bmain, scene, scene->lay);
+ if (oldcfra != scene->r.cfra)
+ BKE_scene_update_for_newframe(context.bmain, scene, scene->lay);
ibuf = sequencer_view3d_cb(scene, camera, context.rectx, context.recty,
IB_rect, context.scene->r.seq_prev_type, TRUE, FALSE, err_out);
if (ibuf == NULL) {
@@ -2431,7 +2432,8 @@ static ImBuf *seq_render_scene_strip(SeqRenderData context, Sequence *seq, float
if (re == NULL)
re = RE_NewRender(scene->id.name);
- BKE_scene_update_for_newframe(context.bmain, scene, scene->lay);
+ if (oldcfra != scene->r.cfra)
+ BKE_scene_update_for_newframe(context.bmain, scene, scene->lay);
RE_BlenderFrame(re, context.bmain, scene, NULL, camera, scene->lay, frame, FALSE);
/* restore previous state after it was toggled on & off by RE_BlenderFrame */