fixed registering & unregistering for all scripts.

Changed all icons to PLUGIN for consistency.

5 files changed, 38 insertions, 9 deletions

diff --git a/add_mesh_diamond.py b/add_mesh_diamond.py
index f210aeb9..eddc9caf 100644
--- a/add_mesh_diamond.py
+++ b/add_mesh_diamond.py
@@ -166,3 +166,10 @@ def register():
 def unregister():
     bpy.types.unregister(AddDiamond)
     bpy.types.INFO_MT_mesh_add.remove(menu_func)
+	
+	    # Remove "Diamond" menu from the "Add Mesh" menu.
+    space_info.INFO_MT_mesh_add.remove(menu_func)
+
+if __name__ == "__main__":
+    register()
+
diff --git a/add_mesh_gears.py b/add_mesh_gears.py
index fc6f1e6e..e0c924bd 100644
--- a/add_mesh_gears.py
+++ b/add_mesh_gears.py
@@ -358,7 +358,7 @@ class AddGear(bpy.types.Operator):
 # blenderbuttons file from the release/datafiles directory
 
 menu_func = (lambda self, context: self.layout.operator(AddGear.bl_idname,
-                                        text="Gear", icon='GEARS'))
+                                        text="Gear", icon='PLUGIN'))
 
 def register():
     bpy.types.register(AddGear)
@@ -367,3 +367,10 @@ def register():
 def unregister():
     bpy.types.unregister(AddGear)
     bpy.types.INFO_MT_mesh_add.remove(menu_func)
+	
+	    # Remove "Gears" menu from the "Add Mesh" menu.
+    space_info.INFO_MT_mesh_add.remove(menu_func)
+
+if __name__ == "__main__":
+    register()
+
diff --git a/add_mesh_gem.py b/add_mesh_gem.py
index 0964dd89..f4b1a3d4 100644
--- a/add_mesh_gem.py
+++ b/add_mesh_gem.py
@@ -218,7 +218,7 @@ class AddGem(bpy.types.Operator):
 
 
 menu_func = (lambda self, context: self.layout.operator(AddGem.bl_idname,
-                                        text="Gem", icon='GEARS'))
+                                        text="Gem", icon='PLUGIN'))
 
 def register():
     bpy.types.register(AddGem)
@@ -229,3 +229,10 @@ def register():
 def unregister():
     bpy.types.unregister(AddGem)
     bpy.types.INFO_MT_mesh_add.remove(menu_func)
+	
+	    # Remove "Gem" menu from the "Add Mesh" menu.
+    space_info.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 8ea20402..f3d1accb 100644
--- a/add_mesh_pipe_joint.py
+++ b/add_mesh_pipe_joint.py
@@ -663,7 +663,7 @@ class AddWyeJoint(bpy.types.Operator):
 class AddCrossJoint(bpy.types.Operator):
     '''Add a Cross-Joint mesh'''
     # Create the vertices and polygons for a coss (+ or X) pipe joint.
-    bl_idname = "mesh.primitive_cross_joint_add" 
+    bl_idname = "mesh.primitive_cross_joint_add"
     bl_label = "Add Pipe Cross-Joint"
     bl_options = {'REGISTER', 'UNDO'}
 
@@ -1088,7 +1088,7 @@ class INFO_MT_mesh_pipe_joints_add(bpy.types.Menu):
         layout.operator("mesh.primitive_cross_joint_add",
             text="Pipe Cross-Joint")
         layout.operator("mesh.primitive_n_joint_add",
-            text="Pipe N-Joint" )
+            text="Pipe N-Joint")
 #        layout.separator()
 
 ################################
@@ -1096,9 +1096,8 @@ class INFO_MT_mesh_pipe_joints_add(bpy.types.Menu):
 import space_info
 
 # Define "Pipe Joints" menu
-# Define "Pipe Joints" menu
 menu_func = (lambda self,
-    context: self.layout.menu("INFO_MT_mesh_pipe_joints_add", icon='GEARS'))
+    context: self.layout.menu("INFO_MT_mesh_pipe_joints_add", icon='PLUGIN'))
 
 
 def register():
@@ -1124,5 +1123,7 @@ def unregister():
     bpy.types.unregister(INFO_MT_mesh_pipe_joints_add)
 
     # Remove "Pipe Joints" menu from the "Add Mesh" menu.
-    #space_info.INFO_MT_mesh_add.remove(menu_func)
-	
+    space_info.INFO_MT_mesh_add.remove(menu_func)
+
+if __name__ == "__main__":
+    register()
diff --git a/add_mesh_star.py b/add_mesh_star.py
index dfdad7f1..7178f3fb 100644
--- a/add_mesh_star.py
+++ b/add_mesh_star.py
@@ -156,7 +156,7 @@ class AddStar(bpy.types.Operator):
 # blenderbuttons file from the release/datafiles directory
 
 menu_func = (lambda self, context: self.layout.operator(AddStar.bl_idname,
-                                        text="Star", icon='GEARS'))
+                                        text="Star", icon='PLUGIN'))
 
 def register():
     bpy.types.register(AddStar)
@@ -165,3 +165,10 @@ def register():
 def unregister():
     bpy.types.unregister(AddStar)
     bpy.types.INFO_MT_mesh_add.remove(menu_func)
+	
+	    # Remove "Star" menu from the "Add Mesh" menu.
+    space_info.INFO_MT_mesh_add.remove(menu_func)
+
+if __name__ == "__main__":
+    register()
+