[Bf-extensions-cvs] [0b2d9d5] master: Revert last commit

meta-androcto noreply at git.blender.org
Thu Apr 13 10:30:44 CEST 2017


Commit: 0b2d9d5394c8c8a1506b5d8bc53ae3b61ec89eef
Author: meta-androcto
Date:   Thu Apr 13 18:30:22 2017 +1000
Branches: master
https://developer.blender.org/rBA0b2d9d5394c8c8a1506b5d8bc53ae3b61ec89eef

Revert last commit

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

M	add_mesh_extra_objects/__init__.py

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

diff --git a/add_mesh_extra_objects/__init__.py b/add_mesh_extra_objects/__init__.py
index 2b42692..b3eb833 100644
--- a/add_mesh_extra_objects/__init__.py
+++ b/add_mesh_extra_objects/__init__.py
@@ -29,18 +29,10 @@ bl_info = {
     "location": "View3D > Add > Mesh",
     "description": "Add extra mesh object types",
     "warning": "",
-    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/Scripts/Add_Mesh/Add_Extra",
+    "wiki_url": "https://wiki.blender.org/index.php/Extensions:2.6/Py/Scripts/Add_Mesh/Add_Extra",
     "category": "Add Mesh",
 }
 
-from .geodesic_domes import __init__
-from .geodesic_domes import add_shape_geodesic
-from .geodesic_domes import forms_271
-from .geodesic_domes import geodesic_classes_271
-from .geodesic_domes import third_domes_panel_271
-from .geodesic_domes import vefm_271
-
-
 if "bpy" in locals():
     import importlib
     importlib.reload(add_mesh_star)
@@ -64,7 +56,11 @@ if "bpy" in locals():
     importlib.reload(add_mesh_beam_builder)
     importlib.reload(Wallfactory)
     importlib.reload(Blocks)
-    importlib.reload(add_mesh_triangles)
+    importlib.reload(add_shape_geodesic)
+    importlib.reload(forms_271)
+    importlib.reload(geodesic_classes_271)
+    importlib.reload(third_domes_panel_271)
+    importlib.reload(vefm_271)
 else:
     from . import add_mesh_star
     from . import add_mesh_twisted_torus
@@ -87,7 +83,12 @@ else:
     from . import add_mesh_beam_builder
     from . import Wallfactory
     from . import Blocks
-    from . import add_mesh_triangles
+
+    from .geodesic_domes import add_shape_geodesic
+    from .geodesic_domes import forms_271
+    from .geodesic_domes import geodesic_classes_271
+    from .geodesic_domes import third_domes_panel_271
+    from .geodesic_domes import vefm_271
 
 import bpy
 from bpy.types import Menu
@@ -161,7 +162,7 @@ class INFO_MT_mesh_math_add(Menu):
         layout.operator("mesh.primitive_xyz_function_surface",
                         text="XYZ Math Surface")
         self.layout.operator("mesh.primitive_solid_add", text="Regular Solid")
-        self.layout.operator("mesh.make_triangle", icon = "MESH_DATA")
+
 
 class INFO_MT_mesh_mech(Menu):
     # Define the "Math Function" menu



More information about the Bf-extensions-cvs mailing list