[Bf-blender-cvs] [e6064b412a6] blender2.8: Fix object mode/edit mode panels not visible in collections

Dalai Felinto noreply at git.blender.org
Tue Jan 23 19:05:51 CET 2018


Commit: e6064b412a6ed703d19028e2f05420af3bf45121
Author: Dalai Felinto
Date:   Tue Jan 23 16:05:25 2018 -0200
Branches: blender2.8
https://developer.blender.org/rBe6064b412a6ed703d19028e2f05420af3bf45121

Fix object mode/edit mode panels not visible in collections

This was broken since e8c15e0ed15f83. When object_mode moved from
workspace to window.

===================================================================

M	release/scripts/startup/bl_ui/properties_collection.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/properties_collection.py b/release/scripts/startup/bl_ui/properties_collection.py
index cc6d606d27e..9a8e0a7562a 100644
--- a/release/scripts/startup/bl_ui/properties_collection.py
+++ b/release/scripts/startup/bl_ui/properties_collection.py
@@ -91,8 +91,8 @@ class COLLECTION_PT_object_mode_settings(CollectionButtonsPanel, Panel):
 
     @classmethod
     def poll(cls, context):
-        workspace = context.workspace
-        return workspace and hasattr(workspace, 'object_mode') and (workspace.object_mode == 'OBJECT')
+        window = context.window
+        return window and hasattr(window, 'object_mode') and (window.object_mode == 'OBJECT')
 
     def draw(self, context):
         layout = self.layout
@@ -110,8 +110,8 @@ class COLLECTION_PT_edit_mode_settings(CollectionButtonsPanel, Panel):
 
     @classmethod
     def poll(cls, context):
-        workspace = context.workspace
-        return workspace and hasattr(workspace, 'object_mode') and (workspace.object_mode == 'EDIT')
+        window = context.window
+        return window and hasattr(window, 'object_mode') and (window.object_mode == 'EDIT')
 
     def draw(self, context):
         layout = self.layout
@@ -134,8 +134,8 @@ class COLLECTION_PT_paint_weight_mode_settings(CollectionButtonsPanel, Panel):
 
     @classmethod
     def poll(cls, context):
-        workspace = context.workspace
-        return workspace and hasattr(workspace, 'object_mode') and (workspace.object_mode == 'WEIGHT_PAINT')
+        window = context.window
+        return window and hasattr(window, 'object_mode') and (window.object_mode == 'WEIGHT_PAINT')
 
     def draw(self, context):
         layout = self.layout
@@ -153,8 +153,8 @@ class COLLECTION_PT_paint_vertex_mode_settings(CollectionButtonsPanel, Panel):
 
     @classmethod
     def poll(cls, context):
-        workspace = context.workspace
-        return workspace and hasattr(workspace, 'object_mode') and (workspace.object_mode == 'VERTEX_PAINT')
+        window = context.window
+        return window and hasattr(window, 'object_mode') and (window.object_mode == 'VERTEX_PAINT')
 
     def draw(self, context):
         layout = self.layout



More information about the Bf-blender-cvs mailing list