[Bf-blender-cvs] [d2a5ea0] master: Fix T38467: Animation playback is not synchronized when Screen Layout changes

[Bastien Montagne]

Commit: d2a5ea04ed8448865b4daa21c0010727eee118ba
Author: Bastien Montagne
Date:   Fri Feb 28 10:04:57 2014 +0100
https://developer.blender.org/rBd2a5ea04ed8448865b4daa21c0010727eee118ba

Fix T38467: Animation playback is not synchronized when Screen Layout changes

When both old and new screens share the same scene, "transfer" playback to new screen, else stop playback.

===================================================================

M	source/blender/editors/screen/screen_edit.c

===================================================================

diff --git a/source/blender/editors/screen/screen_edit.c b/source/blender/editors/screen/screen_edit.c
index 86e7839..66fa578 100644
--- a/source/blender/editors/screen/screen_edit.c
+++ b/source/blender/editors/screen/screen_edit.c
@@ -1518,8 +1518,17 @@ void ED_screen_set(bContext *C, bScreen *sc)
 			WM_event_timer_sleep(wm, win, wt, true);
 		
 		ED_screen_exit(C, win, oldscreen);
-		oldscreen->animtimer = wt;
-		
+
+		/* Same scene, "transfer" playback to new screen. */
+		if (oldscene == sc->scene) {
+			sc->animtimer = wt;
+		}
+		/* Else, stop playback. */
+		else {
+			oldscreen->animtimer = wt;
+			ED_screen_animation_play(C, 0, 0);
+		}
+
 		win->screen = sc;
 		CTX_wm_window_set(C, win);  // stores C->wm.screen... hrmf