[Bf-blender-cvs] [cc1253a5d92] master: Fix: "Lock Markers" option was not being obeyed by the "Sync Markers (when transforming)" option

[Joshua Leung]

Commit: cc1253a5d92c0a5241263f021fb2ca7e6b2c06f6
Author: Joshua Leung
Date:   Mon Nov 20 01:47:21 2017 +1300
Branches: master
https://developer.blender.org/rBcc1253a5d92c0a5241263f021fb2ca7e6b2c06f6

Fix: "Lock Markers" option was not being obeyed by the "Sync Markers (when transforming)" option

===================================================================

M	source/blender/editors/animation/anim_markers.c

===================================================================

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) {