[Bf-blender-cvs] [538f2aeaefb] master: Fix AV-sync sometimes putting scene one frame back
Sergey Sharybin
noreply at git.blender.org
Mon Jun 17 17:52:25 CEST 2019
Commit: 538f2aeaefb0272da66a921cf0ed9aad30f09206
Author: Sergey Sharybin
Date: Mon Jun 17 17:52:02 2019 +0200
Branches: master
https://developer.blender.org/rB538f2aeaefb0272da66a921cf0ed9aad30f09206
Fix AV-sync sometimes putting scene one frame back
===================================================================
M source/blender/editors/screen/screen_ops.c
===================================================================
diff --git a/source/blender/editors/screen/screen_ops.c b/source/blender/editors/screen/screen_ops.c
index f6034a7051e..1a146f5bd07 100644
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -4243,7 +4243,7 @@ static int screen_animation_step(bContext *C, wmOperator *UNUSED(op), const wmEv
scene->r.cfra++;
}
else {
- scene->r.cfra = newfra + 0.5;
+ scene->r.cfra = max_ii(scene->r.cfra, newfra + 0.5);
}
#ifdef PROFILE_AUDIO_SYNCH
More information about the Bf-blender-cvs
mailing list