Revision: 27537
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=27537
Author: campbellbarton
Date: 2010-03-16 14:46:40 +0100 (Tue, 16 Mar 2010)
Log Message:
-----------
transform marker sync for extend and grab is back.
Modified Paths:
--------------
branches/render25/release/scripts/ui/space_sequencer.py
branches/render25/source/blender/editors/transform/transform_conversions.c
branches/render25/source/blender/makesrna/intern/rna_space.c
Modified: branches/render25/release/scripts/ui/space_sequencer.py
===================================================================
--- branches/render25/release/scripts/ui/space_sequencer.py 2010-03-16
13:22:27 UTC (rev 27536)
+++ branches/render25/release/scripts/ui/space_sequencer.py 2010-03-16
13:46:40 UTC (rev 27537)
@@ -136,6 +136,8 @@
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")
Modified:
branches/render25/source/blender/editors/transform/transform_conversions.c
===================================================================
--- branches/render25/source/blender/editors/transform/transform_conversions.c
2010-03-16 13:22:27 UTC (rev 27536)
+++ branches/render25/source/blender/editors/transform/transform_conversions.c
2010-03-16 13:46:40 UTC (rev 27537)
@@ -3868,6 +3868,8 @@
}
} else {
+ t->frame_side= 'B';
+
/* *** Normal Transform *** */
if (seq->depth == 0) {
@@ -4736,6 +4738,24 @@
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 */
Modified: branches/render25/source/blender/makesrna/intern/rna_space.c
===================================================================
--- branches/render25/source/blender/makesrna/intern/rna_space.c
2010-03-16 13:22:27 UTC (rev 27536)
+++ branches/render25/source/blender/makesrna/intern/rna_space.c
2010-03-16 13:46:40 UTC (rev 27537)
@@ -1268,7 +1268,7 @@
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);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
