From 72cbf6baa5113979cafc40f1b0e9d5c02b4386d7 Mon Sep 17 00:00:00 2001
From: Campbell Barton <ideasman42@gmail.com>
Date: Mon, 21 Mar 2011 03:36:12 +0000
Subject: [PATCH] dont import UI directly, get classes via bpy.types
---
add_mesh_3d_function_surface.py | 13 +++++++------
add_mesh_ant_landscape.py | 5 ++---
add_mesh_extras.py | 5 ++---
add_mesh_gemstones.py | 6 +++---
add_mesh_pipe_joint.py | 7 +++----
add_mesh_solid.py | 11 +++++------
object_fracture/__init__.py | 7 +++----
rigify/ui.py | 2 +-
8 files changed, 26 insertions(+), 30 deletions(-)
diff --git a/add_mesh_3d_function_surface.py b/add_mesh_3d_function_surface.py
index 5f5e74b53..1e15ddcc6 100644
--- a/add_mesh_3d_function_surface.py
+++ b/add_mesh_3d_function_surface.py
@@ -497,7 +497,6 @@ class AddXYZFunctionSurface(bpy.types.Operator):
################################
-import space_info
# Define "3D Function Surface" menu
@@ -517,16 +516,18 @@ def register():
bpy.utils.register_module(__name__)
# Add menus to the "Add Mesh" menu
- space_info.INFO_MT_mesh_add.append(menu_func_z)
- space_info.INFO_MT_mesh_add.append(menu_func_xyz)
+ INFO_MT_mesh_add = bpy.types.INFO_MT_mesh_add
+ INFO_MT_mesh_add.append(menu_func_z)
+ INFO_MT_mesh_add.append(menu_func_xyz)
def unregister():
bpy.utils.unregister_module(__name__)
# Remove menus from the "Add Mesh" menu.
- space_info.INFO_MT_mesh_add.remove(menu_func_z)
- space_info.INFO_MT_mesh_add.remove(menu_func_xyz)
+ INFO_MT_mesh_add = bpy.types.INFO_MT_mesh_add
+ INFO_MT_mesh_add.remove(menu_func_z)
+ INFO_MT_mesh_add.remove(menu_func_xyz)
if __name__ == "__main__":
- register()
+ register()
\ No newline at end of file
diff --git a/add_mesh_ant_landscape.py b/add_mesh_ant_landscape.py
index b07fe992f..48f3675f7 100644
--- a/add_mesh_ant_landscape.py
+++ b/add_mesh_ant_landscape.py
@@ -799,7 +799,6 @@ class landscape_add(bpy.types.Operator):
###------------------------------------------------------------
# Register
-import space_info
# Define "Landscape" menu
def menu_func_landscape(self, context):
@@ -808,12 +807,12 @@ def menu_func_landscape(self, context):
def register():
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():
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__":
register()
diff --git a/add_mesh_extras.py b/add_mesh_extras.py
index 40236d04b..01e1b4b09 100644
--- a/add_mesh_extras.py
+++ b/add_mesh_extras.py
@@ -522,7 +522,6 @@ class INFO_MT_mesh_extras_add(bpy.types.Menu):
# Register all operators and panels
-import space_info
# Define "Extras" menu
def menu_func(self, context):
@@ -533,14 +532,14 @@ def register():
bpy.utils.register_module(__name__)
# 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():
bpy.utils.unregister_module(__name__)
# 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__":
register()
diff --git a/add_mesh_gemstones.py b/add_mesh_gemstones.py
index 9ae823827..13bcbc1ba 100644
--- a/add_mesh_gemstones.py
+++ b/add_mesh_gemstones.py
@@ -347,7 +347,6 @@ class INFO_MT_mesh_gemstones_add(bpy.types.Menu):
# Register all operators and panels
-import space_info
# Define "Gemstones" menu
@@ -359,14 +358,15 @@ def register():
bpy.utils.register_module(__name__)
# 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():
bpy.utils.unregister_module(__name__)
# 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__":
register()
diff --git a/add_mesh_pipe_joint.py b/add_mesh_pipe_joint.py
index 392ca0993..86e1d1f37 100644
--- a/add_mesh_pipe_joint.py
+++ b/add_mesh_pipe_joint.py
@@ -1126,8 +1126,6 @@ class INFO_MT_mesh_pipe_joints_add(bpy.types.Menu):
################################
-import space_info
-
# Define "Pipe Joints" menu
def menu_func(self, context):
@@ -1138,14 +1136,15 @@ def register():
bpy.utils.register_module(__name__)
# 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():
bpy.utils.unregister_module(__name__)
# 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__":
register()
diff --git a/add_mesh_solid.py b/add_mesh_solid.py
index 48d73e44d..46ee7327f 100644
--- a/add_mesh_solid.py
+++ b/add_mesh_solid.py
@@ -796,9 +796,6 @@ class OtherMenu(bpy.types.Menu):
layout.operator_context = 'INVOKE_REGION_WIN'
layout.operator(Solids.bl_idname, text = "Cube").preset = "c"
layout.operator(Solids.bl_idname, text = "Soccer ball").preset = "sb"
-
-
-import space_info
def menu_func(self, context):
@@ -808,12 +805,14 @@ def menu_func(self, context):
def register():
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():
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__":
register()
diff --git a/object_fracture/__init__.py b/object_fracture/__init__.py
index 8fac79882..33d1c851c 100644
--- a/object_fracture/__init__.py
+++ b/object_fracture/__init__.py
@@ -58,8 +58,6 @@ class INFO_MT_add_fracture_objects(bpy.types.Menu):
layout.operator("object.import_fracture_recorder",
text="Rigidbody Recorder")
-import space_info
-
def menu_func(self, context):
self.layout.menu("INFO_MT_add_fracture_objects", icon="PLUGIN")
@@ -69,14 +67,15 @@ def register():
bpy.utils.register_module(__name__)
# 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():
bpy.utils.unregister_module(__name__)
# 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__":
register()
diff --git a/rigify/ui.py b/rigify/ui.py
index 7fadbd378..a751cfe93 100644
--- a/rigify/ui.py
+++ b/rigify/ui.py
@@ -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'))
-#import space_info # ensure the menu is loaded first
+#from bl_ui import space_info # ensure the menu is loaded first
def register():
bpy.utils.register_class(DATA_PT_rigify_buttons)
--
GitLab