bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

transform marker sync for extend and grab is back.

Browse Source 
(commit 27537 by Campbell from render25 branch)
This commit is contained in:
Brecht Van Lommel 2010-03-16 18:01:22 +00:00
parent 2b34078fb2
commit abb7a25426
3 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/ui/space_sequencer.py
View File

@ -136,6 +136,8 @@ class SEQUENCER_MT_view(bpy.types.Menu):
layout.prop(st, "separate_color_preview")
layout.separator()
layout.prop(st, "use_marker_sync")
layout.separator()
layout.operator("screen.area_dupli")
layout.operator("screen.screen_full_area")

20
source/blender/editors/transform/transform_conversions.c
View File

@ -3847,6 +3847,8 @@ static void SeqTransInfo(TransInfo *t, Sequence *seq, int *recursive, int *count
}
} else {
t->frame_side= 'B';
/* *** Normal Transform *** */
if (seq->depth == 0) {
@ -4708,6 +4710,24 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
if (t->spacetype == SPACE_SEQ) {
/* freeSeqData in transform_conversions.c does this
* keep here so the else at the end wont run... */
SpaceSeq *sseq= (SpaceSeq *)t->sa->spacedata.first;
/* marker transform, not especially nice but we may want to move markers
* at the same time as keyframes in the dope sheet. */
if ((sseq->flag & SEQ_MARKER_TRANS) && (cancelled == 0)) {
/* cant use , TFM_TIME_EXTEND
* for some reason EXTEND is changed into TRANSLATE, so use frame_side instead */
if(t->mode == TFM_SEQ_SLIDE) {
if(t->frame_side == 'B')
scene_marker_tfm_translate(t->scene, floor(t->values[0] + 0.5f), SELECT);
}
else if (ELEM(t->frame_side, 'L', 'R')) {
scene_marker_tfm_extend(t->scene, floor(t->vec[0] + 0.5f), SELECT, t->scene->r.cfra, t->frame_side);
}
}
}
else if (t->spacetype == SPACE_NODE) {
/* pass */

2
source/blender/makesrna/intern/rna_space.c
View File

@ -1276,7 +1276,7 @@ static void rna_def_space_sequencer(BlenderRNA *brna)
RNA_def_property_ui_text(prop, "Draw Frames", "Draw frames rather then seconds");
RNA_def_property_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL);
prop= RNA_def_property(srna, "transform_markers", PROP_BOOLEAN, PROP_NONE);
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_update(prop, NC_SPACE|ND_SPACE_SEQUENCER, NULL);