Enhance world background mode application logic

2026-03-31 20:19:04 +02:00
parent fe2809515a
commit 7709fa317b
1 changed files with 4 additions and 2 deletions
--- a/src/app/App.tsx
+++ b/src/app/App.tsx
@@ -1900,10 +1900,12 @@ export function App({ store, initialStatusMessage }: AppProps) {

  const applyWorldBackgroundMode = (mode: WorldBackgroundMode, imageAssetId?: string) => {
    if (mode === "image") {
+      const currentBackgroundAssetId =
+        editorState.document.world.background.mode === "image" ? editorState.document.world.background.assetId : null;
      const nextImageAssetId =
        imageAssetId ??
-        (editorState.document.world.background.mode === "image"
-          ? editorState.document.world.background.assetId
+        (currentBackgroundAssetId !== null && editorState.document.assets[currentBackgroundAssetId]?.kind === "image"
+          ? currentBackgroundAssetId
          : imageAssetList[0]?.id);

      if (nextImageAssetId === undefined) {