blender
/
blender-addons
17
35
Fork 94
Code Issues 532 Pull Requests 32 Projects 1 Releases Wiki Activity

Merge branch 'master' into asset-browser-poselib

This commit is contained in:
Julian Eisel 2021-04-14 15:21:55 +02:00
parent d4f25bcdc4 1dbdb95ed9
commit 6d091e4f75
11 changed files with 30 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
add_curve_extra_objects/__init__.py
View File

@ -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()

3
add_curve_extra_objects/add_curve_aceous_galore.py
View File

@ -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",
}
"""

2
add_curve_extra_objects/add_curve_braid.py
View File

@ -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",
}
"""

3
add_curve_extra_objects/add_curve_curly.py
View File

@ -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",
}

3
add_curve_extra_objects/add_curve_simple.py
View File

@ -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",
}

5
add_curve_extra_objects/add_curve_spirals.py
View File

@ -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",
}
"""

6
add_curve_extra_objects/add_curve_spirofit_bouncespline.py
View File

@ -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",
}

3
add_curve_extra_objects/add_curve_torus_knots.py
View File

@ -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",
}
"""

2
add_curve_extra_objects/add_surface_plane_cone.py
View File

@ -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"
}

3
add_curve_extra_objects/beveltaper_curve.py
View File

@ -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",
}

11
add_mesh_extra_objects/add_mesh_3d_function_surface.py
View File

@ -1,6 +1,8 @@
# GPL # original by Buerbaum Martin (Pontiac), Elod Csirmaz
import bpy
import math
import numpy
from mathutils import *
from math import *
from bpy.types import Operator
@ -13,13 +15,18 @@ from bpy.props import (
# List of safe functions for eval()
safe_list = ['math', 'acos', 'asin', 'atan', 'atan2', 'ceil', 'cos', 'cosh',
safe_list = ['acos', 'asin', 'atan', 'atan2', 'ceil', 'cos', 'cosh',
'degrees', 'e', 'exp', 'fabs', 'floor', 'fmod', 'frexp', 'hypot',
'ldexp', 'log', 'log10', 'modf', 'pi', 'pow', 'radians',
'sin', 'sinh', 'sqrt', 'tan', 'tanh']
'sin', 'sinh', 'sqrt', 'tan', 'tanh', 'gcd']
# Use the list to filter the local namespace
safe_dict = dict((k, globals().get(k, None)) for k in safe_list)
safe_dict['math'] = math
safe_dict['numpy'] = safe_dict['np'] = numpy
safe_dict['lcm'] = numpy.lcm
safe_dict['max'] = max
safe_dict['min'] = min
# Stores the values of a list of properties and the