diff options
| author | meta-androcto <meta.androcto1@gmail.com> | 2016-06-13 17:33:52 +0300 |
|---|---|---|
| committer | meta-androcto <meta.androcto1@gmail.com> | 2016-06-13 17:33:52 +0300 |
| commit | 75fb4e0a91d46bb8695579b6a780d2c9a9aef624 (patch) | |
| tree | f57f3e6187a2fd2f32362410466c7e2593e6186b /add_mesh_extra_objects/__init__.py | |
| parent | eedce73b26ad84af51b8582a93efe7539b6310ce (diff) | |
fix merge error reported in irc: add blocks file & correct references
Diffstat (limited to 'add_mesh_extra_objects/__init__.py')
| -rw-r--r-- | add_mesh_extra_objects/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/add_mesh_extra_objects/__init__.py b/add_mesh_extra_objects/__init__.py index 98dc1e0c..069a959c 100644 --- a/add_mesh_extra_objects/__init__.py +++ b/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 |