@volter/blender-engine 0.1.38 → 0.1.40

package/browser/runtime.ts

@@ -133,6 +133,10 @@ export interface BlenderCallMetrics {
   readonly wasmMemoryMB: number | null;
 }
 
+/** The engine's linear-memory ceiling, its link's `-sMAXIMUM_MEMORY` (4 GiB, wasm32's limit;
+ *  `blender_web_headless.cmake`). JavaScript cannot read a memory's maximum back. */
+const ENGINE_MEMORY_CEILING_MB = 4096;
+
 export class BlenderRuntime {
   readonly #worker: Worker;
   readonly #options: BlenderRuntimeOptions;
@@ -187,8 +191,15 @@ export class BlenderRuntime {
       // Error ("Uncaught [object Object]"), while the reason (an allocation that failed, the file
       // it was reading) is the last thing Blender printed.
       const last = this.#lastLines.length > 0 ? `\nBlender's last output:\n${this.#lastLines.join('\n')}` : '';
+      // OUT OF MEMORY IS SAID AS SUCH, from the heap the worker reported as the thread died.
+      const heapMB = this.#wasmBytes === null ? null : Math.round(this.#wasmBytes / 1048576);
+      const exhausted =
+        heapMB !== null && heapMB >= ENGINE_MEMORY_CEILING_MB - 16
+          ? `Blender ran out of memory: its heap reached ${heapMB} MB of the in-tab engine's ` +
+            `${ENGINE_MEMORY_CEILING_MB} MB, and this scene needs more. `
+          : '';
       const error = new Error(
-        `Blender worker failed: ${said || 'the worker script did not load'}${where}${last}`,
+        `${exhausted}Blender worker failed: ${said || 'the worker script did not load'}${where}${last}`,
       );
       // The page console is the editor's ledger (`installEditorConsoleReporting`
       // captures it, source-blind), and this package may import nothing of the

package/browser/session.py

@@ -2352,10 +2352,14 @@ class NativeHistory:
         finally:
             self.moving = False
         self.cursor += -1 if direction == "undo" else 1
-        # Native undo replaces datablocks. Both revision caches must forget their
-        # old pointers before the restored scene is exported to the presenter.
-        _blender_web.session_reset()
-        SESSION.forget()
+        # AN UNDO STEP IS AN ORDINARY UPDATE when Blender kept its datablocks and depsgraph:
+        # memfile undo re-reads only the changed IDs and tags exactly those, so the next frame
+        # re-ships what changed and the presenter keeps the rest (`session_undo`). A step that
+        # replaced the depsgraph starts both revision caches over, as does an engine without
+        # the door.
+        if not hasattr(_blender_web, "session_undo") or _blender_web.session_undo():
+            _blender_web.session_reset()
+            SESSION.forget()
         SESSION.present()
         return {"moved": True}
 

package/browser/worker.ts

@@ -704,6 +704,11 @@ function reportMemory(): void {
   if (bytes !== null) post({ op: 'memory', bytes });
 }
 
+// A BLENDER THREAD THAT DIES IS WEIGHED FIRST: its error reaches this scope before the page's
+// `onerror`, so the heap it died at is posted ahead of the failure, and the page can say whether
+// the engine ran out of memory (`runtime.ts`) instead of "Uncaught [object Object]".
+self.addEventListener('error', reportMemory);
+
 self.onmessage = (event: MessageEvent<WorkerRequest>) => {
   const request = event.data;
   if (request.op === 'present-result') {

package/package.json

@@ -2,7 +2,7 @@
   "name": "@volter/blender-engine",
   "author": "Volter AI, Inc.",
   "license": "GPL-3.0-or-later",
-  "version": "0.1.38",
+  "version": "0.1.40",
   "publishConfig": {
     "access": "public"
   },