fix [#28023] VSE: Transform Markers doesn't do anything
authorCampbell Barton <ideasman42@gmail.com>
Mon, 3 Oct 2011 02:49:08 +0000 (02:49 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 3 Oct 2011 02:49:08 +0000 (02:49 +0000)
- renamed to 'Sync Markers' to match action editor.
- action editor option was broken in the same way as the sequencer.

source/blender/editors/transform/transform_conversions.c
source/blender/makesrna/intern/rna_space.c

index e37435a0cd51684f4cc8f1aa5c2e742c96f4e6e6..c4295b158586b6d375180c3924bbe4b5d1b1694a 100644 (file)
@@ -4780,10 +4780,10 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
 
                        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 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
 #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);
                        }
                }
                
index fa98e07da204463d029740cfed22250a721881ec..560e2dbcd8e43fd32fa0b92bb779487af6b0ea85 100644 (file)
@@ -1751,7 +1751,7 @@ static void rna_def_space_sequencer(BlenderRNA *brna)
        
        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);