From 1dbdb95ed93a8b96d12e42e17249f6e2cdd24619 Mon Sep 17 00:00:00 2001
From: Aaron Carlisle <carlisle.b3d@gmail.com>
Date: Mon, 12 Apr 2021 12:28:15 -0400
Subject: [PATCH] Add Curve Extra Objects: Add missing operators to add menu
Also remove text referring to the old "Create" panel.
See T86650
---
add_curve_extra_objects/__init__.py | 32 ++++++-------------
.../add_curve_aceous_galore.py | 3 +-
add_curve_extra_objects/add_curve_braid.py | 2 +-
add_curve_extra_objects/add_curve_curly.py | 3 +-
add_curve_extra_objects/add_curve_simple.py | 3 +-
add_curve_extra_objects/add_curve_spirals.py | 5 +--
.../add_curve_spirofit_bouncespline.py | 6 ++--
.../add_curve_torus_knots.py | 3 +-
.../add_surface_plane_cone.py | 2 +-
add_curve_extra_objects/beveltaper_curve.py | 3 +-
10 files changed, 21 insertions(+), 41 deletions(-)
diff --git a/add_curve_extra_objects/__init__.py b/add_curve_extra_objects/__init__.py
index 407e2fe2f..7a1a3ba7b 100644
--- a/add_curve_extra_objects/__init__.py
+++ b/add_curve_extra_objects/__init__.py
@@ -23,8 +23,8 @@
bl_info = {
"name": "Extra Objects",
"author": "Multiple Authors",
- "version": (0, 1, 4),
- "blender": (2, 80, 0),
+ "version": (0, 1, 5),
+ "blender": (2, 93, 0),
"location": "View3D > Add > Curve > Extra Objects",
"description": "Add extra curve object types",
"warning": "",
@@ -159,11 +159,6 @@ class CurveExtraObjectsAddonPreferences(AddonPreferences):
description="Show/Hide the Add Menu items",
default=False
)
- show_panel_list : BoolProperty(
- name="Panels List",
- description="Show/Hide the Panel items",
- default=False
- )
def draw(self, context):
layout = self.layout
@@ -198,31 +193,20 @@ class CurveExtraObjectsAddonPreferences(AddonPreferences):
box.label(text="Knots:", icon="LAYER_ACTIVE")
box.label(text="Torus Knots Plus, Celtic Links, Braid Knot",
icon="LAYER_USED")
+ box.label(text="SpiroFit, Bounce Spline, Catenary", icon="LAYER_USED")
box.label(text="Curly Curve", icon="LAYER_ACTIVE")
box.label(text="Bevel/Taper:", icon="LAYER_ACTIVE")
box.label(text="Add Curve as Bevel, Add Curve as Taper",
icon="LAYER_USED")
+ box.label(text="Simple Curve:", icon="LAYER_ACTIVE")
+ box.label(text="Available if the Active Object is a Curve was created with 2D Objects",
+ icon="LAYER_USED")
box.label(text="Items located in the Add Menu > Surface (default shortcut Ctrl + A):",
icon="LAYER_USED")
box.label(text="Wedge, Cone, Star, Plane",
icon="LAYER_ACTIVE")
- icon_2 = "TRIA_RIGHT" if not self.show_panel_list else "TRIA_DOWN"
- box = layout.box()
- box.prop(self, "show_panel_list", emboss=False, icon=icon_2)
-
- if self.show_panel_list:
- box.label(text="Panel located in 3D View Tools Region > Create:",
- icon="LAYER_ACTIVE")
- box.label(text="Spline:", icon="LAYER_ACTIVE")
- box.label(text="SpiroFit, Bounce Spline, Catenary", icon="LAYER_USED")
- box.label(text="Panel located in 3D View Tools Region > Tools:",
- icon="LAYER_ACTIVE")
- box.label(text="Simple Curve:", icon="LAYER_ACTIVE")
- box.label(text="Available if the Active Object is a Curve was created with 2D Objects",
- icon="LAYER_USED")
-
class INFO_MT_curve_knots_add(Menu):
# Define the "Extras" menu
@@ -254,6 +238,10 @@ def menu_func(self, context):
return None
layout.separator()
layout.menu(INFO_MT_curve_knots_add.bl_idname, text="Knots", icon='CURVE_DATA')
+ layout.separator()
+ layout.operator("curve.bevelcurve")
+ layout.operator("curve.tapercurve")
+ layout.operator("curve.simple")
def menu_surface(self, context):
self.layout.separator()
diff --git a/add_curve_extra_objects/add_curve_aceous_galore.py b/add_curve_extra_objects/add_curve_aceous_galore.py
index 463b05a03..42239d7a0 100644
--- a/add_curve_extra_objects/add_curve_aceous_galore.py
+++ b/add_curve_extra_objects/add_curve_aceous_galore.py
@@ -25,8 +25,7 @@ bl_info = {
"location": "View3D > Add > Curve",
"description": "Adds many different types of Curves",
"warning": "",
- "doc_url": "https://wiki.blender.org/index.php/Extensions:2.6/Py/"
- "Scripts/Curve/Curves_Galore",
+ "doc_url": "{BLENDER_MANUAL_URL}/addons/add_curve/extra_objects.html",
"category": "Add Curve",
}
"""
diff --git a/add_curve_extra_objects/add_curve_braid.py b/add_curve_extra_objects/add_curve_braid.py
index 5f52d455a..ba32b563e 100644
--- a/add_curve_extra_objects/add_curve_braid.py
+++ b/add_curve_extra_objects/add_curve_braid.py
@@ -9,7 +9,7 @@ bl_info = {
"location": "View3D > Add > Mesh > New Braid",
"description": "Adds a new Braid",
"warning": "",
- "doc_url": "",
+ "doc_url": "{BLENDER_MANUAL_URL}/addons/add_curve/extra_objects.html",
"category": "Add Mesh",
}
"""
diff --git a/add_curve_extra_objects/add_curve_curly.py b/add_curve_extra_objects/add_curve_curly.py
index 72f82f050..d49cb8fb1 100644
--- a/add_curve_extra_objects/add_curve_curly.py
+++ b/add_curve_extra_objects/add_curve_curly.py
@@ -10,8 +10,7 @@ bl_info = {
"location": "View3D > Add > Curve > Curly Curve",
"description": "Adds a new Curly Curve",
"warning": "",
- "doc_url": "https://wiki.blender.org/index.php/Extensions:2.6/"
- "Py/Scripts/Curve/Curly_Curves",
+ "doc_url": "{BLENDER_MANUAL_URL}/addons/add_curve/extra_objects.html",
"category": "Add Curve",
}
diff --git a/add_curve_extra_objects/add_curve_simple.py b/add_curve_extra_objects/add_curve_simple.py
index c994acb96..c69f1e908 100644
--- a/add_curve_extra_objects/add_curve_simple.py
+++ b/add_curve_extra_objects/add_curve_simple.py
@@ -24,8 +24,7 @@ bl_info = {
"location": "View3D > Add > Curve",
"description": "Adds Simple Curve",
"warning": "",
- "doc_url": "https://wiki.blender.org/index.php/Extensions:2.6/"
- "Py/Scripts/Curve/Simple_curves",
+ "doc_url": "{BLENDER_MANUAL_URL}/addons/add_curve/extra_objects.html",
"category": "Add Curve",
}
diff --git a/add_curve_extra_objects/add_curve_spirals.py b/add_curve_extra_objects/add_curve_spirals.py
index aa8790074..f3c5a0744 100644
--- a/add_curve_extra_objects/add_curve_spirals.py
+++ b/add_curve_extra_objects/add_curve_spirals.py
@@ -9,10 +9,7 @@ bl_info = {
"blender": (2, 80, 0),
"location": "View3D > Add > Curve",
"warning": "",
- "doc_url": "https://wiki.blender.org/index.php/Extensions:2.4/Py/"
- "Scripts/Object/Spirals",
- "tracker_url": "http://alexvaqp.googlepages.com?"
- "func=detail&aid=<number>",
+ "doc_url": "{BLENDER_MANUAL_URL}/addons/add_curve/extra_objects.html",
"category": "Add Curve",
}
"""
diff --git a/add_curve_extra_objects/add_curve_spirofit_bouncespline.py b/add_curve_extra_objects/add_curve_spirofit_bouncespline.py
index 41b8a6b54..f2151ee48 100644
--- a/add_curve_extra_objects/add_curve_spirofit_bouncespline.py
+++ b/add_curve_extra_objects/add_curve_spirofit_bouncespline.py
@@ -18,15 +18,15 @@
bl_info = {
- "name": "SpiroFit, BounceSpline and Catenary",
+ "name": "SpiroFit, Bounce Spline, and Catenary",
"author": "Antonio Osprite, Liero, Atom, Jimmy Hazevoet",
"version": (0, 2, 2),
"blender": (2, 80, 0),
- "location": "Sidebar > Create Tab",
+ "location": "Add > Curve > Knots",
"description": "SpiroFit, BounceSpline and Catenary adds "
"splines to selected mesh or objects",
"warning": "",
- "doc_url": "",
+ "doc_url": "{BLENDER_MANUAL_URL}/addons/add_curve/extra_objects.html",
"category": "Object",
}
diff --git a/add_curve_extra_objects/add_curve_torus_knots.py b/add_curve_extra_objects/add_curve_torus_knots.py
index d394484dc..8dac754d9 100644
--- a/add_curve_extra_objects/add_curve_torus_knots.py
+++ b/add_curve_extra_objects/add_curve_torus_knots.py
@@ -25,8 +25,7 @@ bl_info = {
"location": "View3D > Add > Curve",
"description": "Adds many types of (torus) knots",
"warning": "",
- "doc_url": "https://wiki.blender.org/index.php/Extensions:2.6/Py/"
- "Scripts/Curve/Torus_Knot",
+ "doc_url": "{BLENDER_MANUAL_URL}/addons/add_curve/extra_objects.html",
"category": "Add Curve",
}
"""
diff --git a/add_curve_extra_objects/add_surface_plane_cone.py b/add_curve_extra_objects/add_surface_plane_cone.py
index 67026c16a..47771051b 100644
--- a/add_curve_extra_objects/add_surface_plane_cone.py
+++ b/add_curve_extra_objects/add_surface_plane_cone.py
@@ -8,7 +8,7 @@ bl_info = {
"blender": (2, 80, 0),
"location": "View3D > Add > Surface",
"warning": "",
- "doc_url": "",
+ "doc_url": "{BLENDER_MANUAL_URL}/addons/add_curve/extra_objects.html",
"category": "Add Mesh"
}
diff --git a/add_curve_extra_objects/beveltaper_curve.py b/add_curve_extra_objects/beveltaper_curve.py
index c6ce4f93e..27795ed15 100644
--- a/add_curve_extra_objects/beveltaper_curve.py
+++ b/add_curve_extra_objects/beveltaper_curve.py
@@ -25,8 +25,7 @@ bl_info = {
"location": "View3D > Object > Bevel/Taper",
"description": "Adds bevel and/or taper curve to active curve",
"warning": "",
- "doc_url": "https://wiki.blender.org/index.php/Extensions:2.6/"
- "Py/Scripts/Curve/Bevel_-Taper_Curve",
+ "doc_url": "{BLENDER_MANUAL_URL}/addons/add_curve/extra_objects.html",
"category": "Curve",
}
--
GitLab