From 6edc33af7cb4cd1f871fa65de8164f261bf23500 Mon Sep 17 00:00:00 2001 From: Quicksticks-oss Date: Mon, 15 Apr 2024 21:26:04 -0400 Subject: [PATCH 1/2] Camera can no longer be deleted. --- app/pages/PageEnigma/js/editor.ts | 1 + app/pages/PageEnigma/js/timeline.ts | 3 +++ 2 files changed, 4 insertions(+) diff --git a/app/pages/PageEnigma/js/editor.ts b/app/pages/PageEnigma/js/editor.ts index 2d0501d12a..0be4c3058e 100644 --- a/app/pages/PageEnigma/js/editor.ts +++ b/app/pages/PageEnigma/js/editor.ts @@ -653,6 +653,7 @@ class Editor { deleteObject(uuid: string) { const obj = this.activeScene.get_object_by_uuid(uuid); + if(obj?.name === "::CAM::") { return; } if (obj) { this.activeScene.scene.remove(obj); } diff --git a/app/pages/PageEnigma/js/timeline.ts b/app/pages/PageEnigma/js/timeline.ts index 3c27c7a590..a3a099273c 100644 --- a/app/pages/PageEnigma/js/timeline.ts +++ b/app/pages/PageEnigma/js/timeline.ts @@ -245,6 +245,9 @@ export class TimeLine { } public deleteObject(object_uuid: string) { + let object = this.scene.get_object_by_uuid(object_uuid); + if(object === null) { return; } + if(object?.name === "::CAM::") { return; } this.timeline_items = this.timeline_items.filter( (element) => element.object_uuid !== object_uuid, ); From 824c945d6a5e8c8c712552ad857f48899f96e18a Mon Sep 17 00:00:00 2001 From: Quicksticks-oss Date: Mon, 15 Apr 2024 21:31:50 -0400 Subject: [PATCH 2/2] posible issue. --- app/pages/PageEnigma/js/timeline.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/app/pages/PageEnigma/js/timeline.ts b/app/pages/PageEnigma/js/timeline.ts index a3a099273c..4a31463b13 100644 --- a/app/pages/PageEnigma/js/timeline.ts +++ b/app/pages/PageEnigma/js/timeline.ts @@ -246,7 +246,6 @@ export class TimeLine { public deleteObject(object_uuid: string) { let object = this.scene.get_object_by_uuid(object_uuid); - if(object === null) { return; } if(object?.name === "::CAM::") { return; } this.timeline_items = this.timeline_items.filter( (element) => element.object_uuid !== object_uuid,