fix merge error reported in irc: add blocks file & correct references

add_mesh_extra_objects/Wallfactory.py

@@ -32,7 +32,7 @@
 import bpy
 import mathutils
 from bpy.props import *
-from add_mesh_building_objects.Blocks import *
+from add_mesh_extra_objects.Blocks import *
 #from add_mesh_walls.preset_utils import *
 
 

add_mesh_extra_objects/__init__.py

@@ -62,6 +62,7 @@ if "bpy" in locals():
     importlib.reload(mesh_discombobulator)
     importlib.reload(add_mesh_beam_builder)
     importlib.reload(Wallfactory)
+    importlib.reload(Blocks)
 else:
     from . import add_mesh_star
     from . import add_mesh_twisted_torus
@@ -83,7 +84,7 @@ else:
     from . import mesh_discombobulator
     from . import add_mesh_beam_builder
     from . import Wallfactory
-
+    from . import Blocks
 import bpy