[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [27321] trunk/blender/source/blender: Ctrl+RMB support for selecting markers when sync markers is enabled.

Campbell Barton ideasman42 at gmail.com
Mon Mar 8 12:10:05 CET 2010


Revision: 27321
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27321
Author:   campbellbarton
Date:     2010-03-08 12:10:04 +0100 (Mon, 08 Mar 2010)

Log Message:
-----------
Ctrl+RMB support for selecting markers when sync markers is enabled.

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/scene.c
    trunk/blender/source/blender/editors/space_action/action_select.c

Modified: trunk/blender/source/blender/blenkernel/intern/scene.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/scene.c	2010-03-08 10:05:51 UTC (rev 27320)
+++ trunk/blender/source/blender/blenkernel/intern/scene.c	2010-03-08 11:10:04 UTC (rev 27321)
@@ -807,7 +807,7 @@
 
 	for (marker= scene->markers.first; marker; marker= marker->next) {
 		if ((marker->flag & flag) == flag) {
-			if((side=='L' && marker->frame < frame) || (side=='R' && marker->frame > frame)) {
+			if((side=='L' && marker->frame < frame) || (side=='R' && marker->frame >= frame)) {
 				marker->frame += delta;
 				tot++;
 			}

Modified: trunk/blender/source/blender/editors/space_action/action_select.c
===================================================================
--- trunk/blender/source/blender/editors/space_action/action_select.c	2010-03-08 10:05:51 UTC (rev 27320)
+++ trunk/blender/source/blender/editors/space_action/action_select.c	2010-03-08 11:10:04 UTC (rev 27321)
@@ -785,6 +785,25 @@
 			ANIM_fcurve_keys_bezier_loop(&bed, ale->key_data, ok_cb, select_cb, NULL);
 	}
 	
+	/* Sync marker support */
+	if((select_mode==SELECT_ADD) && (ac->spacetype==SPACE_ACTION) && ELEM(leftright, ACTKEYS_LRSEL_LEFT, ACTKEYS_LRSEL_RIGHT)) {
+		SpaceAction *saction= ac->sa->spacedata.first;
+		if (saction && saction->flag & SACTION_MARKERS_MOVE) {
+			TimeMarker *marker;
+
+			for (marker= scene->markers.first; marker; marker= marker->next) {
+				if(	((leftright == ACTKEYS_LRSEL_LEFT) && marker->frame < CFRA) ||
+					((leftright == ACTKEYS_LRSEL_RIGHT) && marker->frame >= CFRA)
+				) {
+					marker->flag |= SELECT;
+				}
+				else {
+					marker->flag &= ~SELECT;
+				}
+			}
+		}
+	}
+
 	/* Cleanup */
 	BLI_freelistN(&anim_data);
 }





More information about the Bf-blender-cvs mailing list