[Bf-extensions-cvs] [d6b0e690] master: Separated geodesic_domes from add_mesh_extra_objects
Spivak Vladimir cwolf3d
noreply at git.blender.org
Tue Feb 5 01:33:56 CET 2019
Commit: d6b0e690e3e323ac805d90f49ffb98264e13b7ee
Author: Spivak Vladimir (cwolf3d)
Date: Tue Feb 5 02:33:12 2019 +0200
Branches: master
https://developer.blender.org/rBAd6b0e690e3e323ac805d90f49ffb98264e13b7ee
Separated geodesic_domes from add_mesh_extra_objects
===================================================================
M add_mesh_extra_objects/__init__.py
R054 add_mesh_extra_objects/geodesic_domes/__init__.py add_mesh_geodesic_domes/__init__.py
R095 add_mesh_extra_objects/geodesic_domes/add_shape_geodesic.py add_mesh_geodesic_domes/add_shape_geodesic.py
R100 add_mesh_extra_objects/geodesic_domes/forms_271.py add_mesh_geodesic_domes/forms_271.py
R100 add_mesh_extra_objects/geodesic_domes/geodesic_classes_271.py add_mesh_geodesic_domes/geodesic_classes_271.py
R095 add_mesh_extra_objects/geodesic_domes/third_domes_panel_271.py add_mesh_geodesic_domes/third_domes_panel_271.py
R100 add_mesh_extra_objects/geodesic_domes/vefm_271.py add_mesh_geodesic_domes/vefm_271.py
===================================================================
diff --git a/add_mesh_extra_objects/__init__.py b/add_mesh_extra_objects/__init__.py
index bfc0359e..da2c4ec7 100644
--- a/add_mesh_extra_objects/__init__.py
+++ b/add_mesh_extra_objects/__init__.py
@@ -61,11 +61,6 @@ if "bpy" in locals():
importlib.reload(add_mesh_beam_builder)
importlib.reload(Blocks)
importlib.reload(Wallfactory)
- importlib.reload(add_shape_geodesic)
- importlib.reload(forms_271)
- importlib.reload(geodesic_classes_271)
- importlib.reload(third_domes_panel_271)
- importlib.reload(vefm_271)
importlib.reload(add_mesh_triangles)
else:
from . import add_mesh_star
@@ -91,21 +86,8 @@ else:
from . import Wallfactory
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
-from bpy.props import (
- BoolProperty,
- IntProperty,
- FloatProperty,
- StringProperty,
- )
-
class VIEW3D_MT_mesh_vert_add(Menu):
# Define the "Single Vert" menu
@@ -268,8 +250,6 @@ def menu_func(self, context):
lay_out.menu("VIEW3D_MT_mesh_torus_add",
text="Torus Objects")
lay_out.separator()
- lay_out.operator("mesh.generate_geodesic_dome",
- text="Geodesic Dome")
lay_out.operator("discombobulate.ops",
text="Discombobulator")
lay_out.separator()
@@ -325,9 +305,6 @@ classes = [
mesh_discombobulator.unchooseDoodad,
add_mesh_beam_builder.addBeam,
Wallfactory.add_mesh_wallb,
- add_shape_geodesic.add_corrective_pose_shape_fast,
- third_domes_panel_271.GenerateGeodesicDome,
- third_domes_panel_271.DialogOperator,
add_mesh_triangles.MakeTriangle
]
diff --git a/add_mesh_extra_objects/geodesic_domes/__init__.py b/add_mesh_geodesic_domes/__init__.py
similarity index 54%
rename from add_mesh_extra_objects/geodesic_domes/__init__.py
rename to add_mesh_geodesic_domes/__init__.py
index e183dfa5..b1954214 100644
--- a/add_mesh_extra_objects/geodesic_domes/__init__.py
+++ b/add_mesh_geodesic_domes/__init__.py
@@ -21,30 +21,62 @@ bl_info = {
"author": "Noctumsolis, PKHG, Meta Androcto, Andy Houston",
"version": (0, 3, 3),
"blender": (2, 80, 0),
- "location": "Toolshelf > Create Tab",
+ "location": "View3D > Add > Mesh",
"description": "Create geodesic dome type objects.",
"warning": "",
"wiki_url": "https://wiki.blender.org/index.php/Extensions:2.6/Py/Scripts/Modeling/Geodesic_Domes",
"tracker_url": "",
- "category": "Mesh"}
+ "category": "Add Mesh"}
if "bpy" in locals():
import importlib
+ 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_shape_geodesic
+ from . import forms_271
+ from . import geodesic_classes_271
from . import third_domes_panel_271
+ from . import vefm_271
import bpy
+# 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("mesh.generate_geodesic_dome",
+ text="Geodesic Dome")
+
+# Register
+classes = [
+ add_shape_geodesic.add_corrective_pose_shape_fast,
+ third_domes_panel_271.GenerateGeodesicDome,
+ third_domes_panel_271.DialogOperator,
+]
def register():
- bpy.utils.register_module(__name__)
+ 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():
- bpy.utils.unregister_module(__name__)
+ # 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/geodesic_domes/add_shape_geodesic.py b/add_mesh_geodesic_domes/add_shape_geodesic.py
similarity index 95%
rename from add_mesh_extra_objects/geodesic_domes/add_shape_geodesic.py
rename to add_mesh_geodesic_domes/add_shape_geodesic.py
index 36b11ae5..70cd1201 100644
--- a/add_mesh_extra_objects/geodesic_domes/add_shape_geodesic.py
+++ b/add_mesh_geodesic_domes/add_shape_geodesic.py
@@ -93,14 +93,3 @@ class add_corrective_pose_shape_fast(bpy.types.Operator):
func_add_corrective_pose_shape_fast(source, target)
return {'FINISHED'}
-
-
-def register():
- bpy.utils.register_module(__name__)
-
-
-def unregister():
- bpy.utils.unregister_module(__name__)
-
-if __name__ == "__main__":
- register()
diff --git a/add_mesh_extra_objects/geodesic_domes/forms_271.py b/add_mesh_geodesic_domes/forms_271.py
similarity index 100%
rename from add_mesh_extra_objects/geodesic_domes/forms_271.py
rename to add_mesh_geodesic_domes/forms_271.py
diff --git a/add_mesh_extra_objects/geodesic_domes/geodesic_classes_271.py b/add_mesh_geodesic_domes/geodesic_classes_271.py
similarity index 100%
rename from add_mesh_extra_objects/geodesic_domes/geodesic_classes_271.py
rename to add_mesh_geodesic_domes/geodesic_classes_271.py
diff --git a/add_mesh_extra_objects/geodesic_domes/third_domes_panel_271.py b/add_mesh_geodesic_domes/third_domes_panel_271.py
similarity index 95%
rename from add_mesh_extra_objects/geodesic_domes/third_domes_panel_271.py
rename to add_mesh_geodesic_domes/third_domes_panel_271.py
index 3cf1e063..2a5a4409 100644
--- a/add_mesh_extra_objects/geodesic_domes/third_domes_panel_271.py
+++ b/add_mesh_geodesic_domes/third_domes_panel_271.py
@@ -32,7 +32,7 @@ class GenerateGeodesicDome(Operator):
bl_label = "Modify Geodesic Objects"
bl_idname = "mesh.generate_geodesic_dome"
bl_description = "Create Geodesic Object Types"
- bl_options = {'REGISTER', 'UNDO'}
+ bl_options = {'REGISTER', 'UNDO', 'PRESET'}
# PKHG_NEW saving and loading parameters
save_parameters: BoolProperty(
@@ -186,275 +186,275 @@ class GenerateGeodesicDome(Operator):
# Cylinder
cyxres: IntProperty(
name="Resolution x/y",
- min=3, max=32,
+ min=3, #max=32,
description="Number of faces around x/y",
default=5
)
cyyres: IntProperty(
name="Resolution z",
- min=3, max=32,
+ min=3, #max=32,
description="Number of faces in z direction",
default=5
)
cyxsz: FloatProperty(
name="Scale x/y",
- min=0.01, max=10,
+ min=0.01, #max=10,
description="Scale in x/y direction",
default=1
)
cyysz: FloatProperty(
name="Scale z",
- min=0.01, max=10,
+ min=0.01, #max=10,
description="Scale in z direction",
default=1
)
cyxell: FloatProperty(
name="Stretch x",
- min=0.001, max=4,
+ min=0.001, #max=4,
description="Stretch in x direction",
default=1
)
cygap: FloatProperty(
name="Gap",
- min=-2, max=2,
+ min=-2, #max=2,
description="Shrink in % around radius",
default=1
)
cygphase: FloatProperty(
- name="Phase", min=-4, max=4,
+ name="Phase", min=-4, #max=4,
description="Rotate around pivot x/y",
default=0
)
# Parabola
paxres: IntProperty(
name="Resolution x/y",
- min=3, max=32,
+ min=3, #max=32,
description="Number of faces around x/y",
default=5
)
payres: IntProperty(
name="Resolution z",
- min=3, max=32,
+ min=3, #max=32,
description="Number of faces in z direction",
default=5
)
paxsz: FloatProperty(
name="Scale x/y",
- min=0.001, max=10,
+ min=0.001, #max=10,
description="scale in x/y direction",
default=0.30
)
paysz: FloatProperty(
name="Scale z",
- min=0.001, max=10,
+ min=0.001, #max=10,
description="Scale in z direction",
default=1
)
paxell: FloatProperty(
name="Stretch x",
- min=0.001, max=4,
+ min=0.001, #max=4,
description="Stretch in x direction",
default=1
)
pagap: FloatProperty(
name="Gap",
- min=-2, max=2,
+ min=-2, #max=2,
description="Shrink in % around radius",
default=1
)
pagphase: FloatProperty(
name="Phase",
- min=-4, max=4,
+ min=-4, #max=4,
description="Rotate around pivot x/y",
default=0
)
# Torus
ures: IntProperty(
name="Resolution x/y",
- min=3, max=32,
+ min=3, #max=32,
description="Number of faces around x/y",
default=8)
vres: IntProperty(
name="Resolution z",
- min=3, max=32,
+ min=3, #max=32,
description="Number of faces in z direction",
default=8)
urad: FloatProperty(
name="Radius x/y",
- min=0.001, max=10,
+ min=0.001, #max=10,
description="Radius in x/y plane",
default=1
)
vrad: FloatProperty(
name="Radius z",
- min=0.001, max=10,
+ min=0.001, #max=10,
description="Radius in z plane",
default=0.250
)
uellipse: FloatPrope
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list