[Bf-extensions-cvs] [29f6146] master: Add mesh extra objects: Fix reloading geodesic domes

[lijenstina]

Commit: 29f6146c10b4e0685382bec9dfdf8f6ca3257c21
Author: lijenstina
Date:   Thu Apr 6 01:34:18 2017 +0200
Branches: master
https://developer.blender.org/rBA29f6146c10b4e0685382bec9dfdf8f6ca3257c21

Add mesh extra objects: Fix reloading geodesic domes

Add importlib call properly after F8 reload
Remove the star import from the Geodesic init
Fix links

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

M	add_mesh_extra_objects/__init__.py
M	add_mesh_extra_objects/geodesic_domes/__init__.py

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

diff --git a/add_mesh_extra_objects/__init__.py b/add_mesh_extra_objects/__init__.py
index d116526..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,6 +56,11 @@ if "bpy" in locals():
     importlib.reload(add_mesh_beam_builder)
     importlib.reload(Wallfactory)
     importlib.reload(Blocks)
+    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,6 +84,12 @@ else:
     from . import Wallfactory
     from . import Blocks
 
+    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
 from bpy.props import (
diff --git a/add_mesh_extra_objects/geodesic_domes/__init__.py b/add_mesh_extra_objects/geodesic_domes/__init__.py
index aa2e509..d4b19fe 100644
--- a/add_mesh_extra_objects/geodesic_domes/__init__.py
+++ b/add_mesh_extra_objects/geodesic_domes/__init__.py
@@ -24,19 +24,18 @@ bl_info = {
     "location": "Toolshelf > Create Tab",
     "description": "Create geodesic dome type objects.",
     "warning": "",
-    "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.6/Py/Scripts/Modeling/Geodesic_Domes",
-    "tracker_url": "https://developer.blender.org/maniphest/task/create/?project=3&type=Bug",
+    "wiki_url": "https://wiki.blender.org/index.php/Extensions:2.6/Py/Scripts/Modeling/Geodesic_Domes",
+    "tracker_url": "",
     "category": "Mesh"}
 
 if "bpy" in locals():
-    import imp
-    imp.reload(third_domes_panel_271)
+    import importlib
+    importlib.reload(third_domes_panel_271)
 
 else:
     from . import third_domes_panel_271
 
 import bpy
-from bpy.props import *
 
 
 def register():
@@ -46,5 +45,6 @@ def register():
 def unregister():
     bpy.utils.unregister_module(__name__)
 
+
 if __name__ == "__main__":
     register()