diff options
author | Spivak Vladimir (cwolf3d) <cwolf3d@gmail.com> | 2019-04-21 14:05:35 +0300 |
---|---|---|
committer | Spivak Vladimir (cwolf3d) <cwolf3d@gmail.com> | 2019-04-21 14:05:35 +0300 |
commit | 2cc1dd0409ae1f36cb45be1261a2c7ab5f41bec6 (patch) | |
tree | 44ba4514adc5a48ec58aef8eaa4a9f3e7c24b981 | |
parent | e49613a5f9c879b1b525e8ac3e3c8af31c3eabcd (diff) |
Separated mesh_discombobulator from add_mesh_extra_objects
-rw-r--r-- | add_mesh_discombobulator/__init__.py | 90 | ||||
-rw-r--r-- | add_mesh_discombobulator/mesh_discombobulator.py (renamed from add_mesh_extra_objects/mesh_discombobulator.py) | 0 | ||||
-rw-r--r-- | add_mesh_extra_objects/__init__.py | 11 |
3 files changed, 90 insertions, 11 deletions
diff --git a/add_mesh_discombobulator/__init__.py b/add_mesh_discombobulator/__init__.py new file mode 100644 index 00000000..853dbc89 --- /dev/null +++ b/add_mesh_discombobulator/__init__.py @@ -0,0 +1,90 @@ +# ##### BEGIN GPL LICENSE BLOCK ##### +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# ##### END GPL LICENSE BLOCK ##### +# Contributed to by: +# Pontiac, Fourmadmen, varkenvarken, tuga3d, meta-androcto, metalliandy # +# dreampainter, cotejrp1, liero, Kayo Phoenix, sugiany, dommetysk, Jambay # +# Phymec, Anthony D'Agostino, Pablo Vazquez, Richard Wilks, lijenstina, # +# Sjaak-de-Draak, Phil Cote, cotejrp1, xyz presets by elfnor, revolt_randy, # + + +bl_info = { + "name": "Discombobulator", + "author": "Multiple Authors", + "version": (0, 0, 8), + "blender": (2, 80, 0), + "location": "View3D > Add > Mesh", + "description": "Add Discombobulator", + "warning": "", + "wiki_url": "https://wiki.blender.org/index.php/Extensions:2.6/" + "Py/Scripts/Add_Mesh/Add_Extra", + "category": "Add Mesh", +} + +# Note: Blocks has to be loaded before the WallFactory or the script +# will not work properly after (F8) reload + +if "bpy" in locals(): + import importlib + importlib.reload(mesh_discombobulator) +else: + from . import mesh_discombobulator + +import bpy +from bpy.types import Menu + +# Register all operators and panels + +# Define "Extras" menu +def menu_func(self, context): + lay_out = self.layout + lay_out.operator_context = 'INVOKE_REGION_WIN' + + lay_out.separator() + lay_out.operator("discombobulate.ops", + text="Discombobulator") + +# Register +classes = [ + + mesh_discombobulator.discombobulator, + mesh_discombobulator.discombobulator_dodads_list, + mesh_discombobulator.discombob_help, + mesh_discombobulator.VIEW3D_OT_tools_discombobulate, + mesh_discombobulator.chooseDoodad, + mesh_discombobulator.unchooseDoodad +] + +def register(): + from bpy.utils import register_class + for cls in classes: + register_class(cls) + + # Add "Extras" menu to the "Add Mesh" menu + bpy.types.VIEW3D_MT_mesh_add.append(menu_func) + + +def unregister(): + # Remove "Extras" menu from the "Add Mesh" menu. + bpy.types.VIEW3D_MT_mesh_add.remove(menu_func) + + from bpy.utils import unregister_class + for cls in reversed(classes): + unregister_class(cls) + +if __name__ == "__main__": + register() diff --git a/add_mesh_extra_objects/mesh_discombobulator.py b/add_mesh_discombobulator/mesh_discombobulator.py index f1d564ac..f1d564ac 100644 --- a/add_mesh_extra_objects/mesh_discombobulator.py +++ b/add_mesh_discombobulator/mesh_discombobulator.py diff --git a/add_mesh_extra_objects/__init__.py b/add_mesh_extra_objects/__init__.py index da2c4ec7..6f5c575b 100644 --- a/add_mesh_extra_objects/__init__.py +++ b/add_mesh_extra_objects/__init__.py @@ -57,7 +57,6 @@ if "bpy" in locals(): importlib.reload(add_mesh_menger_sponge) importlib.reload(add_mesh_vertex) importlib.reload(add_empty_as_parent) - importlib.reload(mesh_discombobulator) importlib.reload(add_mesh_beam_builder) importlib.reload(Blocks) importlib.reload(Wallfactory) @@ -80,7 +79,6 @@ else: from . import add_mesh_menger_sponge from . import add_mesh_vertex from . import add_empty_as_parent - from . import mesh_discombobulator from . import add_mesh_beam_builder from . import Blocks from . import Wallfactory @@ -250,9 +248,6 @@ def menu_func(self, context): lay_out.menu("VIEW3D_MT_mesh_torus_add", text="Torus Objects") lay_out.separator() - lay_out.operator("discombobulate.ops", - text="Discombobulator") - lay_out.separator() lay_out.menu("VIEW3D_MT_mesh_extras_add", text="Extras") lay_out.separator() @@ -297,12 +292,6 @@ classes = [ add_mesh_vertex.AddSymmetricalVert, add_empty_as_parent.P2E, add_empty_as_parent.PreFix, - mesh_discombobulator.discombobulator, - mesh_discombobulator.discombobulator_dodads_list, - mesh_discombobulator.discombob_help, - mesh_discombobulator.VIEW3D_OT_tools_discombobulate, - mesh_discombobulator.chooseDoodad, - mesh_discombobulator.unchooseDoodad, add_mesh_beam_builder.addBeam, Wallfactory.add_mesh_wallb, add_mesh_triangles.MakeTriangle |