Merge branch 'main' into release

Changelog.md

@@ -1,3 +1,7 @@
+# 0.7.4-alpha:
+Bugfixes:
+- Fix timeline collapse on imported objects
+
 # 0.7.3-alpha:
 Bugfixes:
 - Fix some files not importing properly

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "Lightningbeam",
-  "version": "0.7.3-alpha",
+  "version": "0.7.4-alpha",
   "identifier": "org.lightningbeam.core",
   "build": {
     "frontendDist": "../src"

src/main.js

@@ -2175,7 +2175,10 @@ class Layer extends Widget {
     layer.frames = [];
     for (let i in json.frames) {
       const frame = json.frames[i];
-      if (!frame) continue;
+      if (!frame) {
+        layer.frames.push(undefined)
+        continue;
+      }
       if (frame.frameType=="keyframe") {
         layer.frames.push(Frame.fromJSON(frame));
       } else {