[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35528] trunk/blender/source/blender/ editors/transform/transform_conversions.c: Bugfix: "Sync Markers" option in Action Editor is now a bit more

[Joshua Leung]

Revision: 35528
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35528
Author:   aligorith
Date:     2011-03-14 03:10:23 +0000 (Mon, 14 Mar 2011)
Log Message:
-----------
Bugfix: "Sync Markers" option in Action Editor is now a bit more
useful.

Instead of only working for the "extend" transform mode, standard
transforms now work too now (i.e. grab and scale).

TODO:
This currently only works on Scene markers, though it should be
possible to make this work on a provided list of markers instead...

Modified Paths:
--------------
    trunk/blender/source/blender/editors/transform/transform_conversions.c

Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c	2011-03-14 01:37:18 UTC (rev 35527)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c	2011-03-14 03:10:23 UTC (rev 35528)
@@ -4786,17 +4786,15 @@
 
 		/* marker transform, not especially nice but we may want to move markers
 		 * at the same time as keyframes in the dope sheet. */
+		// FIXME: this only does scene markers, but fails when action editor is displaying local markers only...
 		if ((saction->flag & SACTION_MARKERS_MOVE) && (cancelled == 0)) {
-			/* cant use , TFM_TIME_EXTEND
-			 * for some reason EXTEND is changed into TRANSLATE, so use frame_side instead */
-
-			if(t->mode == TFM_TIME_TRANSLATE) {
-				if(t->frame_side == 'B')
-					scene_marker_tfm_translate(t->scene, floor(t->vec[0] + 0.5f), SELECT);
-				else if (ELEM(t->frame_side, 'L', 'R'))
+			if (t->mode == TFM_TIME_TRANSLATE) {
+				if (ELEM(t->frame_side, 'L', 'R')) /* TFM_TIME_EXTEND */
 					scene_marker_tfm_extend(t->scene, floor(t->vec[0] + 0.5f), SELECT, t->scene->r.cfra, t->frame_side);
+				else /* TFM_TIME_TRANSLATE */
+					scene_marker_tfm_translate(t->scene, floor(t->vec[0] + 0.5f), SELECT);
 			}
-			else if(t->mode == TFM_TIME_SCALE) {
+			else if (t->mode == TFM_TIME_SCALE) {
 				scene_marker_tfm_scale(t->scene, t->vec[0], SELECT);
 			}
 		}