@volter/blender-engine 0.1.35 → 0.1.36

package/browser/session.py

@@ -760,13 +760,17 @@ def _empty_display(obj):
 
 
 def _saved_view():
-    """The 3D View the file saved, which is where Blender opens it: the `Modeling` workspace's
-    (this editor's Model workspace is Blender's Modeling), else the first 3D View any screen
-    holds. `RegionView3D`'s pivot, rotation (view to world, `(w, x, y, z)`), distance and
-    projection (`PERSP`, `ORTHO`, or `CAMERA` for a view through the scene camera), and the
-    `View3D`'s lens."""
+    """The 3D View the file saved, which is where Blender opens it: the one on the screen the
+    file's window was showing when it was saved (Blender reopens that workspace; a stock file's is
+    `Layout`), else the `Modeling` workspace's (this editor's Model workspace is Blender's
+    Modeling), else the first 3D View any screen holds. `RegionView3D`'s pivot, rotation (view to
+    world, `(w, x, y, z)`), distance and projection (`PERSP`, `ORTHO`, or `CAMERA` for a view
+    through the scene camera), the `View3D`'s lens, and its SHADING TYPE, which Blender reopens
+    with the view: a file saved in Material Preview opens in Material Preview."""
+    screens = [window.screen for wm in bpy.data.window_managers for window in wm.windows
+               if window.screen is not None]
     workspace = bpy.data.workspaces.get("Modeling")
-    screens = list(workspace.screens) if workspace is not None else []
+    screens.extend(workspace.screens if workspace is not None else [])
     screens.extend(bpy.data.screens)
     for screen in screens:
         for area in screen.areas:
@@ -780,6 +784,7 @@ def _saved_view():
                 "rotation": [float(v) for v in region.view_rotation],
                 "distance": float(region.view_distance),
                 "perspective": region.view_perspective,
+                "shading": space.shading.type,
             }
     return None
 

package/browser/three/blender-runtime-view.ts

@@ -43,6 +43,13 @@ import {
 } from './blender-runtime-camera-view';
 import { DEFAULT_VIEWPORT_DISPLAY, workbenchMaterial } from './blender-workbench-material';
 
+/** A saved `View3DShading.type` as the stage's draw mode: Material Preview is `preview`. */
+const SAVED_SHADING = {
+  WIREFRAME: 'wireframe',
+  SOLID: 'solid',
+  MATERIAL: 'preview',
+  RENDERED: 'rendered',
+} as const;
 const scalar = z.number().finite();
 const point = z.tuple([scalar, scalar, scalar]);
 const edge = z.tuple([z.number().int().nonnegative(), z.number().int().nonnegative()]);
@@ -547,6 +554,7 @@ export const frameSchema = z
         distance: z.number().finite(),
         perspective: z.enum(['PERSP', 'ORTHO', 'CAMERA']),
         lens: z.number().finite().positive().default(50),
+        shading: z.enum(['WIREFRAME', 'SOLID', 'MATERIAL', 'RENDERED']).optional(),
       })
       .nullable()
       .optional(),
@@ -831,8 +839,9 @@ export class BlenderRuntimeView {
    * direction from the pivot to the eye (the view's +Z, `view_rotation` turning view space into
    * the world: RNA's inverse of `viewquat`), the screen's up (the view's +Y), the distance and
    * the projection. A view saved through the scene camera opens in perspective along the same
-   * axis: looking through a camera is not a view this stage has. Null before a frame or when
-   * the file saved no 3D View.
+   * axis: looking through a camera is not a view this stage has. With it the view's SHADING, the
+   * draw mode Blender reopens it in (null from a file whose view carried none). Null before a
+   * frame or when the file saved no 3D View.
    */
   savedView(): {
     readonly target: readonly [number, number, number];
@@ -841,6 +850,7 @@ export class BlenderRuntimeView {
     readonly distance: number;
     readonly projection: 'perspective' | 'orthographic';
     readonly lens: number;
+    readonly drawMode: 'wireframe' | 'solid' | 'preview' | 'rendered' | null;
   } | null {
     const saved = this.frame?.view;
     if (!saved) return null;
@@ -855,6 +865,7 @@ export class BlenderRuntimeView {
       distance: saved.distance,
       projection: saved.perspective === 'ORTHO' ? 'orthographic' : 'perspective',
       lens: saved.lens,
+      drawMode: saved.shading ? SAVED_SHADING[saved.shading] : null,
     };
   }
 

package/package.json

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