griefith/test2
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bugfix: "Sync Markers" option in Action Editor is now a bit more

Browse Source 
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...
This commit is contained in:
Joshua Leung
2011-03-14 03:10:23 +00:00
parent bd1c5d48f2
commit f96a1546c0
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4786,17 +4786,15 @@ void special_aftertrans_update(bContext *C, TransInfo *t)
/* 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);
}
}