Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-08-09 17:31:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflict

Browse Source
This commit is contained in:
Dion Moult
2023-07-11 18:15:18 +10:00
parent 8689164769
commit 24fdfc6d82
2 changed files with 10 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/blenderbim/blenderbim/bim/handler.py
+7 -14
View File
@@ -280,8 +280,7 @@ if getattr(bpy.types, "SCENE_PT_scene"):
@classmethod
def poll(cls, context):
aprops = tool.Blender.get_area_properties(context)
return aprops.tab == "BLENDER" or context.area.spaces.active.search_filter
return tool.Blender.is_tab(context, "BLENDER")
if getattr(bpy.types, "SCENE_PT_unit"):
@@ -291,8 +290,7 @@ if getattr(bpy.types, "SCENE_PT_unit"):
@classmethod
def poll(cls, context):
aprops = tool.Blender.get_area_properties(context)
return aprops.tab == "BLENDER" or context.area.spaces.active.search_filter
return tool.Blender.is_tab(context, "BLENDER")
if getattr(bpy.types, "SCENE_PT_physics"):
@@ -302,8 +300,7 @@ if getattr(bpy.types, "SCENE_PT_physics"):
@classmethod
def poll(cls, context):
aprops = tool.Blender.get_area_properties(context)
return aprops.tab == "BLENDER" or context.area.spaces.active.search_filter
return tool.Blender.is_tab(context, "BLENDER")
if getattr(bpy.types, "SCENE_PT_rigid_body_world"):
@@ -313,8 +310,7 @@ if getattr(bpy.types, "SCENE_PT_rigid_body_world"):
@classmethod
def poll(cls, context):
aprops = tool.Blender.get_area_properties(context)
return aprops.tab == "BLENDER" or context.area.spaces.active.search_filter
return tool.Blender.is_tab(context, "BLENDER")
if getattr(bpy.types, "SCENE_PT_audio"):
@@ -324,8 +320,7 @@ if getattr(bpy.types, "SCENE_PT_audio"):
@classmethod
def poll(cls, context):
aprops = tool.Blender.get_area_properties(context)
return aprops.tab == "BLENDER" or context.area.spaces.active.search_filter
return tool.Blender.is_tab(context, "BLENDER")
if getattr(bpy.types, "SCENE_PT_keying_sets"):
@@ -335,8 +330,7 @@ if getattr(bpy.types, "SCENE_PT_keying_sets"):
@classmethod
def poll(cls, context):
aprops = tool.Blender.get_area_properties(context)
return aprops.tab == "BLENDER" or context.area.spaces.active.search_filter
return tool.Blender.is_tab(context, "BLENDER")
if getattr(bpy.types, "SCENE_PT_custom_props"):
@@ -346,8 +340,7 @@ if getattr(bpy.types, "SCENE_PT_custom_props"):
@classmethod
def poll(cls, context):
aprops = tool.Blender.get_area_properties(context)
return aprops.tab == "BLENDER" or context.area.spaces.active.search_filter
return tool.Blender.is_tab(context, "BLENDER")
@persistent
src/blenderbim/blenderbim/bim/operator.py
+3 -1
View File
@@ -47,7 +47,9 @@ class SwitchTab(bpy.types.Operator):
bl_description = "Switches to the last used tab"
def execute(self, context):
aprops = tool.Blender.get_area_properties(context)
if context.area.spaces.active.search_filter:
return {"FINISHED"}
aprops = context.screen.BIMAreaProperties[context.screen.areas[:].index(context.area)]
aprops.tab = aprops.alt_tab
return {"FINISHED"}