diff options
| author | Joshua Leung <aligorith@gmail.com> | 2017-11-19 15:47:21 +0300 |
|---|---|---|
| committer | Joshua Leung <aligorith@gmail.com> | 2017-11-19 15:57:22 +0300 |
| commit | cc1253a5d92c0a5241263f021fb2ca7e6b2c06f6 (patch) | |
| tree | ea7bb43c1f9d57c3eb2b86b2ee5cea280dc93fe1 /source/blender/editors/animation | |
| parent | fc77676f3326894482848b3f4e544c7569d5b440 (diff) | |
Fix: "Lock Markers" option was not being obeyed by the "Sync Markers (when transforming)" option
Diffstat (limited to 'source/blender/editors/animation')
| -rw-r--r-- | source/blender/editors/animation/anim_markers.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c index 30aaee8cbd9..04398e88499 100644 --- a/source/blender/editors/animation/anim_markers.c +++ b/source/blender/editors/animation/anim_markers.c @@ -133,10 +133,13 @@ int ED_markers_post_apply_transform(ListBase *markers, Scene *scene, int mode, f float cfra = (float)CFRA; int changed_tot = 0; - /* sanity check */ - if (markers == NULL) + /* sanity check - no markers, or locked markers */ + if ((scene->toolsettings->lock_markers) || + (markers == NULL)) + { return changed_tot; - + } + /* affect selected markers - it's unlikely that we will want to affect all in this way? */ for (marker = markers->first; marker; marker = marker->next) { if (marker->flag & SELECT) { |