[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50504] trunk/blender/source/blender/ editors/screen/screen_edit.c: Fix #32530: animation playback did not respect preview frame range if the current
Brecht Van Lommel
brechtvanlommel at pandora.be
Mon Sep 10 16:00:03 CEST 2012
Revision: 50504
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50504
Author: blendix
Date: 2012-09-10 14:00:01 +0000 (Mon, 10 Sep 2012)
Log Message:
-----------
Fix #32530: animation playback did not respect preview frame range if the current
frame was before the start frame.
Modified Paths:
--------------
trunk/blender/source/blender/editors/screen/screen_edit.c
Modified: trunk/blender/source/blender/editors/screen/screen_edit.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_edit.c 2012-09-10 11:46:15 UTC (rev 50503)
+++ trunk/blender/source/blender/editors/screen/screen_edit.c 2012-09-10 14:00:01 UTC (rev 50504)
@@ -1767,12 +1767,22 @@
sad->ar = CTX_wm_region(C);
/* if startframe is larger than current frame, we put currentframe on startframe.
* note: first frame then is not drawn! (ton) */
- if (scene->r.sfra > scene->r.cfra) {
- sad->sfra = scene->r.cfra;
- scene->r.cfra = scene->r.sfra;
+ if (PRVRANGEON) {
+ if (scene->r.psfra > scene->r.cfra) {
+ sad->sfra = scene->r.cfra;
+ scene->r.cfra = scene->r.psfra;
+ }
+ else
+ sad->sfra = scene->r.cfra;
}
- else
- sad->sfra = scene->r.cfra;
+ else {
+ if (scene->r.sfra > scene->r.cfra) {
+ sad->sfra = scene->r.cfra;
+ scene->r.cfra = scene->r.sfra;
+ }
+ else
+ sad->sfra = scene->r.cfra;
+ }
sad->redraws = redraws;
sad->refresh = refresh;
sad->flag |= (enable < 0) ? ANIMPLAY_FLAG_REVERSE : 0;
More information about the Bf-blender-cvs
mailing list