[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47069] trunk/blender/source/blender/ editors/screen/screen_ops.c: when SCREEN_OT_keyframe_jump fails dont send notifiers or call sound_seek_scene

Campbell Barton ideasman42 at gmail.com
Sun May 27 13:22:06 CEST 2012


Revision: 47069
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47069
Author:   campbellbarton
Date:     2012-05-27 11:22:06 +0000 (Sun, 27 May 2012)
Log Message:
-----------
when SCREEN_OT_keyframe_jump fails dont send notifiers or call sound_seek_scene

Modified Paths:
--------------
    trunk/blender/source/blender/editors/screen/screen_ops.c

Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c	2012-05-27 11:12:29 UTC (rev 47068)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c	2012-05-27 11:22:06 UTC (rev 47069)
@@ -1959,20 +1959,24 @@
 				cfra = ak->cfra;
 			}
 		}
-	} while ((ak != NULL) && (done == 0));
-	
-	/* any success? */
-	if (done == 0)
-		BKE_report(op->reports, RPT_INFO, "No more keyframes to jump to in this direction");
-	
+	} while ((ak != NULL) && (done == FALSE));
+
 	/* free temp stuff */
 	BLI_dlrbTree_free(&keys);
-	
-	sound_seek_scene(bmain, scene);
 
-	WM_event_add_notifier(C, NC_SCENE | ND_FRAME, scene);
-	
-	return OPERATOR_FINISHED;
+	/* any success? */
+	if (done == FALSE) {
+		BKE_report(op->reports, RPT_INFO, "No more keyframes to jump to in this direction");
+
+		return OPERATOR_CANCELLED;
+	}
+	else {
+		sound_seek_scene(bmain, scene);
+
+		WM_event_add_notifier(C, NC_SCENE | ND_FRAME, scene);
+
+		return OPERATOR_FINISHED;
+	}
 }
 
 static void SCREEN_OT_keyframe_jump(wmOperatorType *ot)




More information about the Bf-blender-cvs mailing list