skyler
/
Lightningbeam
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' into release

This commit is contained in:
Skyler Lehmkuhl 2025-01-12 14:41:18 -05:00
parent 51bed98b0b 44877959ce
commit 6bbc660019
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog.md
View File

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

2
src-tauri/tauri.conf.json
View File

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

5
src/main.js
View File

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