Merge branch 'master' into blender2.8

2 files changed, 20 insertions, 5 deletions

diff --git a/source/blender/editors/animation/anim_markers.c b/source/blender/editors/animation/anim_markers.c
index 4821fdd6af7..a5965336e12 100644
--- a/source/blender/editors/animation/anim_markers.c
+++ b/source/blender/editors/animation/anim_markers.c
@@ -136,10 +136,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) {
diff --git a/source/blender/editors/animation/keyframes_general.c b/source/blender/editors/animation/keyframes_general.c
index 97f53561bfe..bf5d4ec0300 100644
--- a/source/blender/editors/animation/keyframes_general.c
+++ b/source/blender/editors/animation/keyframes_general.c
@@ -448,6 +448,18 @@ void sample_fcurve(FCurve *fcu)
 		/* check if selected, and which end this is */
 		if (BEZT_ISSEL_ANY(bezt)) {
 			if (start) {
+				/* If next bezt is also selected, don't start sampling yet,
+				 * but instead wait for that one to reconsider, to avoid
+				 * changing the curve when sampling consecutive segments
+				 * (T53229)
+				 */
+				if (i < fcu->totvert - 1) {
+					BezTriple *next = &fcu->bezt[i + 1];
+					if (BEZT_ISSEL_ANY(next)) {
+						continue;
+					}
+				}
+				
 				/* set end */
 				end = bezt;
 				
@@ -480,8 +492,8 @@ void sample_fcurve(FCurve *fcu)
 					i += (range - 1);
 				}
 				
-				/* bezt was selected, so it now marks the start of a whole new chain to search */
-				start = bezt;
+				/* the current selection island has ended, so start again from scratch */
+				start = NULL;
 				end = NULL;
 			}
 			else {