Skip to content
Snippets Groups Projects
Commit 72cbf6ba authored by Campbell Barton's avatar Campbell Barton
Browse files

dont import UI directly, get classes via bpy.types

parent 795844bb
No related branches found
No related tags found
No related merge requests found
...@@ -497,7 +497,6 @@ class AddXYZFunctionSurface(bpy.types.Operator): ...@@ -497,7 +497,6 @@ class AddXYZFunctionSurface(bpy.types.Operator):
################################ ################################
import space_info
# Define "3D Function Surface" menu # Define "3D Function Surface" menu
...@@ -517,16 +516,18 @@ def register(): ...@@ -517,16 +516,18 @@ def register():
bpy.utils.register_module(__name__) bpy.utils.register_module(__name__)
# Add menus to the "Add Mesh" menu # Add menus to the "Add Mesh" menu
space_info.INFO_MT_mesh_add.append(menu_func_z) INFO_MT_mesh_add = bpy.types.INFO_MT_mesh_add
space_info.INFO_MT_mesh_add.append(menu_func_xyz) INFO_MT_mesh_add.append(menu_func_z)
INFO_MT_mesh_add.append(menu_func_xyz)
def unregister(): def unregister():
bpy.utils.unregister_module(__name__) bpy.utils.unregister_module(__name__)
# Remove menus from the "Add Mesh" menu. # Remove menus from the "Add Mesh" menu.
space_info.INFO_MT_mesh_add.remove(menu_func_z) INFO_MT_mesh_add = bpy.types.INFO_MT_mesh_add
space_info.INFO_MT_mesh_add.remove(menu_func_xyz) INFO_MT_mesh_add.remove(menu_func_z)
INFO_MT_mesh_add.remove(menu_func_xyz)
if __name__ == "__main__": if __name__ == "__main__":
register() register()
\ No newline at end of file
...@@ -799,7 +799,6 @@ class landscape_add(bpy.types.Operator): ...@@ -799,7 +799,6 @@ class landscape_add(bpy.types.Operator):
###------------------------------------------------------------ ###------------------------------------------------------------
# Register # Register
import space_info
# Define "Landscape" menu # Define "Landscape" menu
def menu_func_landscape(self, context): def menu_func_landscape(self, context):
...@@ -808,12 +807,12 @@ def menu_func_landscape(self, context): ...@@ -808,12 +807,12 @@ def menu_func_landscape(self, context):
def register(): def register():
bpy.utils.register_module(__name__) bpy.utils.register_module(__name__)
space_info.INFO_MT_mesh_add.append(menu_func_landscape) bpy.types.INFO_MT_mesh_add.append(menu_func_landscape)
def unregister(): def unregister():
bpy.utils.unregister_module(__name__) bpy.utils.unregister_module(__name__)
space_info.INFO_MT_mesh_add.remove(menu_func_landscape) bpy.types.INFO_MT_mesh_add.remove(menu_func_landscape)
if __name__ == "__main__": if __name__ == "__main__":
register() register()
...@@ -522,7 +522,6 @@ class INFO_MT_mesh_extras_add(bpy.types.Menu): ...@@ -522,7 +522,6 @@ class INFO_MT_mesh_extras_add(bpy.types.Menu):
# Register all operators and panels # Register all operators and panels
import space_info
# Define "Extras" menu # Define "Extras" menu
def menu_func(self, context): def menu_func(self, context):
...@@ -533,14 +532,14 @@ def register(): ...@@ -533,14 +532,14 @@ def register():
bpy.utils.register_module(__name__) bpy.utils.register_module(__name__)
# Add "Extras" menu to the "Add Mesh" menu # Add "Extras" menu to the "Add Mesh" menu
space_info.INFO_MT_mesh_add.append(menu_func) bpy.types.INFO_MT_mesh_add.append(menu_func)
def unregister(): def unregister():
bpy.utils.unregister_module(__name__) bpy.utils.unregister_module(__name__)
# Remove "Extras" menu from the "Add Mesh" menu. # Remove "Extras" menu from the "Add Mesh" menu.
space_info.INFO_MT_mesh_add.remove(menu_func) bpy.types.INFO_MT_mesh_add.remove(menu_func)
if __name__ == "__main__": if __name__ == "__main__":
register() register()
...@@ -347,7 +347,6 @@ class INFO_MT_mesh_gemstones_add(bpy.types.Menu): ...@@ -347,7 +347,6 @@ class INFO_MT_mesh_gemstones_add(bpy.types.Menu):
# Register all operators and panels # Register all operators and panels
import space_info
# Define "Gemstones" menu # Define "Gemstones" menu
...@@ -359,14 +358,15 @@ def register(): ...@@ -359,14 +358,15 @@ def register():
bpy.utils.register_module(__name__) bpy.utils.register_module(__name__)
# Add "Gemstones" menu to the "Add Mesh" menu # Add "Gemstones" menu to the "Add Mesh" menu
space_info.INFO_MT_mesh_add.append(menu_func) bpy.types.INFO_MT_mesh_add.append(menu_func)
def unregister(): def unregister():
bpy.utils.unregister_module(__name__) bpy.utils.unregister_module(__name__)
# Remove "Gemstones" menu from the "Add Mesh" menu. # Remove "Gemstones" menu from the "Add Mesh" menu.
space_info.INFO_MT_mesh_add.remove(menu_func) bpy.types.INFO_MT_mesh_add.remove(menu_func)
if __name__ == "__main__": if __name__ == "__main__":
register() register()
...@@ -1126,8 +1126,6 @@ class INFO_MT_mesh_pipe_joints_add(bpy.types.Menu): ...@@ -1126,8 +1126,6 @@ class INFO_MT_mesh_pipe_joints_add(bpy.types.Menu):
################################ ################################
import space_info
# Define "Pipe Joints" menu # Define "Pipe Joints" menu
def menu_func(self, context): def menu_func(self, context):
...@@ -1138,14 +1136,15 @@ def register(): ...@@ -1138,14 +1136,15 @@ def register():
bpy.utils.register_module(__name__) bpy.utils.register_module(__name__)
# Add "Pipe Joints" menu to the "Add Mesh" menu # Add "Pipe Joints" menu to the "Add Mesh" menu
space_info.INFO_MT_mesh_add.append(menu_func) bpy.types.INFO_MT_mesh_add.append(menu_func)
def unregister(): def unregister():
bpy.utils.unregister_module(__name__) bpy.utils.unregister_module(__name__)
# Remove "Pipe Joints" menu from the "Add Mesh" menu. # Remove "Pipe Joints" menu from the "Add Mesh" menu.
space_info.INFO_MT_mesh_add.remove(menu_func) bpy.types.INFO_MT_mesh_add.remove(menu_func)
if __name__ == "__main__": if __name__ == "__main__":
register() register()
...@@ -796,9 +796,6 @@ class OtherMenu(bpy.types.Menu): ...@@ -796,9 +796,6 @@ class OtherMenu(bpy.types.Menu):
layout.operator_context = 'INVOKE_REGION_WIN' layout.operator_context = 'INVOKE_REGION_WIN'
layout.operator(Solids.bl_idname, text = "Cube").preset = "c" layout.operator(Solids.bl_idname, text = "Cube").preset = "c"
layout.operator(Solids.bl_idname, text = "Soccer ball").preset = "sb" layout.operator(Solids.bl_idname, text = "Soccer ball").preset = "sb"
import space_info
def menu_func(self, context): def menu_func(self, context):
...@@ -808,12 +805,14 @@ def menu_func(self, context): ...@@ -808,12 +805,14 @@ def menu_func(self, context):
def register(): def register():
bpy.utils.register_module(__name__) bpy.utils.register_module(__name__)
space_info.INFO_MT_mesh_add.append(menu_func) bpy.types.INFO_MT_mesh_add.append(menu_func)
def unregister(): def unregister():
bpy.utils.unregister_module(__name__) bpy.utils.unregister_module(__name__)
space_info.INFO_MT_mesh_add.remove(menu_func) bpy.types.INFO_MT_mesh_add.remove(menu_func)
if __name__ == "__main__": if __name__ == "__main__":
register() register()
...@@ -58,8 +58,6 @@ class INFO_MT_add_fracture_objects(bpy.types.Menu): ...@@ -58,8 +58,6 @@ class INFO_MT_add_fracture_objects(bpy.types.Menu):
layout.operator("object.import_fracture_recorder", layout.operator("object.import_fracture_recorder",
text="Rigidbody Recorder") text="Rigidbody Recorder")
import space_info
def menu_func(self, context): def menu_func(self, context):
self.layout.menu("INFO_MT_add_fracture_objects", icon="PLUGIN") self.layout.menu("INFO_MT_add_fracture_objects", icon="PLUGIN")
...@@ -69,14 +67,15 @@ def register(): ...@@ -69,14 +67,15 @@ def register():
bpy.utils.register_module(__name__) bpy.utils.register_module(__name__)
# Add the "add fracture objects" menu to the "Add" menu # Add the "add fracture objects" menu to the "Add" menu
space_info.INFO_MT_add.append(menu_func) bpy.types.INFO_MT_add.append(menu_func)
def unregister(): def unregister():
bpy.utils.unregister_module(__name__) bpy.utils.unregister_module(__name__)
# Remove "add fracture objects" menu from the "Add" menu. # Remove "add fracture objects" menu from the "Add" menu.
space_info.INFO_MT_add.remove(menu_func) bpy.types.INFO_MT_add.remove(menu_func)
if __name__ == "__main__": if __name__ == "__main__":
register() register()
...@@ -240,7 +240,7 @@ class Sample(bpy.types.Operator): ...@@ -240,7 +240,7 @@ class Sample(bpy.types.Operator):
#menu_func = (lambda self, context: self.layout.menu("INFO_MT_armature_metarig_add", icon='OUTLINER_OB_ARMATURE')) #menu_func = (lambda self, context: self.layout.menu("INFO_MT_armature_metarig_add", icon='OUTLINER_OB_ARMATURE'))
#import space_info # ensure the menu is loaded first #from bl_ui import space_info # ensure the menu is loaded first
def register(): def register():
bpy.utils.register_class(DATA_PT_rigify_buttons) bpy.utils.register_class(DATA_PT_rigify_buttons)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment