Merge branch 'master' into greasepencil-objectgreasepencil-object

 Conflicts:
	release/scripts/startup/bl_ui/space_userpref.py
	source/blender/blenkernel/BKE_gpencil.h
	source/blender/blenkernel/BKE_gpencil_update_cache.h
	source/blender/blenkernel/CMakeLists.txt
	source/blender/blenkernel/intern/gpencil.c
	source/blender/blenkernel/intern/gpencil_update_cache.c
	source/blender/blenlib/BLI_listbase.h
	source/blender/blenlib/intern/DLRB_tree.c
	source/blender/depsgraph/intern/eval/deg_eval_copy_on_write.cc
	source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_gpencil.cc
	source/blender/depsgraph/intern/eval/deg_eval_runtime_backup_gpencil.h
	source/blender/makesdna/DNA_gpencil_types.h
	source/blender/makesrna/intern/rna_gpencil.c

1 files changed, 5 insertions, 2 deletions

diff --git a/source/blender/editors/space_nla/nla_edit.c b/source/blender/editors/space_nla/nla_edit.c
index 1376dade659..28041c0389f 100644
--- a/source/blender/editors/space_nla/nla_edit.c
+++ b/source/blender/editors/space_nla/nla_edit.c
@@ -1397,8 +1397,11 @@ static void nlaedit_split_strip_actclip(
     nstrip->actstart = splitaframe;
   }
 
-  /* clear the active flag from the copy */
-  nstrip->flag &= ~NLASTRIP_FLAG_ACTIVE;
+  /* Make sure Sync Length is off. With that setting on, entering and exiting tweak mode would
+   * effectively undo the split, because both the old and the new strip will be at the length of
+   * the Action again. */
+  strip->flag &= ~NLASTRIP_FLAG_SYNC_LENGTH;
+  nstrip->flag &= ~(NLASTRIP_FLAG_SYNC_LENGTH | NLASTRIP_FLAG_ACTIVE);
 
   /* auto-name the new strip */
   BKE_nlastrip_validate_name(adt, nstrip);