From e4f2b2be26adbb5c34231598526a270559c6e183 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Mon, 16 Oct 2017 17:15:03 -0200 Subject: Workspace: Move engines to workspace and Properties Editor cleanup Engine is not stored in WorkSpaces. That defines the "context" engine, which is used for the entire UI. The engine used for the poll of nodes (add node menu, new nodes when "Use Nodes") is obtained from context. Introduce a ViewRender struct for viewport settings that are defined for workspaces and scene. This struct will be populated with the hand-picked settings that can be defined per workspace as per the 2.8 design. * use_scene_settings * properties editor: workshop + organize context path Use Scene Settings ================== For viewport drawing, Workspaces have an option to use the Scene render settings (F12) instead of the viewport settings. This way users can quickly preview the final render settings, engine and View Layer. This will affect all the editors in that workspace, and it will be clearly indicated in the top-bar. Properties Editor: Add Workspace and organize context path ========================================================== We now have the properties of: Scene, Scene > Layer, Scene > World, Workspace [Scene | Workspace] > Render Layer > Object [Scene | Workspace] > Render Layer > Object > Data (...) Reviewers: Campbell Barton, Julian Eisel Differential Revision: https://developer.blender.org/D2842 --- release/scripts/startup/bl_ui/properties_scene.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'release/scripts/startup/bl_ui/properties_scene.py') diff --git a/release/scripts/startup/bl_ui/properties_scene.py b/release/scripts/startup/bl_ui/properties_scene.py index 8c65ed2b78a..a143433a28e 100644 --- a/release/scripts/startup/bl_ui/properties_scene.py +++ b/release/scripts/startup/bl_ui/properties_scene.py @@ -60,8 +60,8 @@ class SceneButtonsPanel: @classmethod def poll(cls, context): - rd = context.scene.render - return context.scene and (rd.engine in cls.COMPAT_ENGINES) + view_render = context.scene.view_render + return context.scene and (view_render.engine in cls.COMPAT_ENGINES) class SCENE_PT_scene(SceneButtonsPanel, Panel): @@ -75,7 +75,7 @@ class SCENE_PT_scene(SceneButtonsPanel, Panel): layout.prop(scene, "camera") layout.prop(scene, "background_set", text="Background") - if context.scene.render.engine != 'BLENDER_GAME': + if context.engine != 'BLENDER_GAME': layout.prop(scene, "active_clip", text="Active Clip") @@ -333,7 +333,7 @@ class SCENE_PT_rigid_body_world(SceneButtonsPanel, Panel): def poll(cls, context): scene = context.scene rd = scene.render - return scene and (rd.engine in cls.COMPAT_ENGINES) + return scene and (view_render.engine in cls.COMPAT_ENGINES) def draw_header(self, context): scene = context.scene @@ -378,9 +378,9 @@ class SCENE_PT_rigid_body_cache(SceneButtonsPanel, Panel): @classmethod def poll(cls, context): - rd = context.scene.render scene = context.scene - return scene and scene.rigidbody_world and (rd.engine in cls.COMPAT_ENGINES) + view_render = scene.view_render + return scene and scene.rigidbody_world and (view_render.engine in cls.COMPAT_ENGINES) def draw(self, context): scene = context.scene @@ -396,9 +396,9 @@ class SCENE_PT_rigid_body_field_weights(SceneButtonsPanel, Panel): @classmethod def poll(cls, context): - rd = context.scene.render + view_render = context.scene.view_render scene = context.scene - return scene and scene.rigidbody_world and (rd.engine in cls.COMPAT_ENGINES) + return scene and scene.rigidbody_world and (view_render.engine in cls.COMPAT_ENGINES) def draw(self, context): scene = context.scene @@ -412,13 +412,13 @@ class SCENE_PT_simplify(SceneButtonsPanel, Panel): COMPAT_ENGINES = {'BLENDER_RENDER', 'BLENDER_CLAY', 'BLENDER_EEVEE'} def draw_header(self, context): - rd = context.scene.render + view_render = context.scene.view_render self.layout.prop(rd, "use_simplify", text="") def draw(self, context): layout = self.layout - rd = context.scene.render + view_render = context.scene.view_render layout.active = rd.use_simplify -- cgit v1.2.3