Frame movement on timeline changed

2025-09-15 19:27:07 -04:00
parent f49eaa6a37
commit 9fb6366d7c
8 changed files with 401 additions and 139 deletions
--- a/src/settings.h
+++ b/src/settings.h
@@ -123,7 +123,7 @@
    X(editorGridColor,        EDITOR_GRID_COLOR,            TYPE_VEC4,         {1.0,1.0,1.0,0.125}) \
    X(editorBackgroundColor,  EDITOR_BACKGROUND_COLOR,      TYPE_VEC4,         {0.113,0.184,0.286,1.0}) \
    \
-    X(mergeType,              MERGE_TYPE,                   TYPE_INT,          ANM2_MERGE_APPEND_FRAMES) \
+    X(mergeType,              MERGE_TYPE,                   TYPE_INT,          ANM2_MERGE_APPEND) \
    X(mergeIsDeleteAnimationsAfter,MERGE_IS_DELETE_ANIMATIONS_AFTER,TYPE_BOOL, false) \
    \
    X(bakeInterval,           BAKE_INTERVAL,                TYPE_INT,          1) \