[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40763] trunk/blender/source/blender: fix [#28023] VSE: Transform Markers doesn't do anything

[Campbell Barton]

Revision: 40763
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40763
Author:   campbellbarton
Date:     2011-10-03 02:49:08 +0000 (Mon, 03 Oct 2011)
Log Message:
-----------
fix [#28023] VSE: Transform Markers doesn't do anything
- renamed to 'Sync Markers' to match action editor.
- action editor option was broken in the same way as the sequencer.

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

Modified: trunk/blender/source/blender/editors/transform/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/editors/transform/transform_conversions.c      
2011-10-03 01:36:25 UTC (rev 40762)
+++ trunk/blender/source/blender/editors/transform/transform_conversions.c      
2011-10-03 02:49:08 UTC (rev 40763)
@@ -4780,10 +4780,10 @@
 
                        if(t->mode == TFM_SEQ_SLIDE) {
                                if(t->frame_side == 'B')
-                                       
ED_markers_post_apply_transform(&t->scene->markers, t->scene, 
TFM_TIME_TRANSLATE, t->vec[0], t->frame_side);
+                                       
ED_markers_post_apply_transform(&t->scene->markers, t->scene, 
TFM_TIME_TRANSLATE, t->values[0], t->frame_side);
                        }
                        else if (ELEM(t->frame_side, 'L', 'R')) {
-                               
ED_markers_post_apply_transform(&t->scene->markers, t->scene, TFM_TIME_EXTEND, 
t->vec[0], t->frame_side);
+                               
ED_markers_post_apply_transform(&t->scene->markers, t->scene, TFM_TIME_EXTEND, 
t->values[0], t->frame_side);
                        }
                }
 
@@ -4892,16 +4892,16 @@
 #if 0
                                if (ELEM(t->frame_side, 'L', 'R')) { /* 
TFM_TIME_EXTEND */
                                        /* same as below */
-                                       
ED_markers_post_apply_transform(ED_context_get_markers(C), t->scene, t->mode, 
t->vec[0], t->frame_side);
+                                       
ED_markers_post_apply_transform(ED_context_get_markers(C), t->scene, t->mode, 
t->values[0], t->frame_side);
                                }
                                else /* TFM_TIME_TRANSLATE */
 #endif
                                {
-                                       
ED_markers_post_apply_transform(ED_context_get_markers(C), t->scene, t->mode, 
t->vec[0], t->frame_side);
+                                       
ED_markers_post_apply_transform(ED_context_get_markers(C), t->scene, t->mode, 
t->values[0], t->frame_side);
                                }
                        }
                        else if (t->mode == TFM_TIME_SCALE) {
-                               
ED_markers_post_apply_transform(ED_context_get_markers(C), t->scene, t->mode, 
t->vec[0], t->frame_side);
+                               
ED_markers_post_apply_transform(ED_context_get_markers(C), t->scene, t->mode, 
t->values[0], t->frame_side);
                        }
                }
                

Modified: trunk/blender/source/blender/makesrna/intern/rna_space.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_space.c    2011-10-03 
01:36:25 UTC (rev 40762)
+++ trunk/blender/source/blender/makesrna/intern/rna_space.c    2011-10-03 
02:49:08 UTC (rev 40763)
@@ -1751,7 +1751,7 @@
        
        prop= RNA_def_property(srna, "use_marker_sync", PROP_BOOLEAN, 
PROP_NONE);
        RNA_def_property_boolean_sdna(prop, NULL, "flag", SEQ_MARKER_TRANS);
-       RNA_def_property_ui_text(prop, "Transform Markers", "Transform markers 
as well as strips");
+       RNA_def_property_ui_text(prop, "Sync Markers", "Transform markers as 
well as strips");
        RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL);
        
        prop= RNA_def_property(srna, "show_separate_color", PROP_BOOLEAN, 
PROP_NONE);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs