diff options
author | Hans Goudey <h.goudey@me.com> | 2020-09-16 18:20:38 +0300 |
---|---|---|
committer | Hans Goudey <h.goudey@me.com> | 2020-09-16 18:20:38 +0300 |
commit | 60fa80de0b2c7138fc86b8b688f22a9d2623e8ed (patch) | |
tree | 44d7acc6bf5022866f5369a0151c513d4dfd957e /release | |
parent | 365271a5886e1678b41e636581616446766b5f85 (diff) |
Curves: Add custom profile bevel support
This adds support for the same custom bevel profile widget used in
the bevel tool and modifier to the geometry generation for curves.
This is expecially useful for text and 2D curves with extrusion, as
it works much better than a weld & bevel modifier combination.
It can also be useful for adding quick detail to pipe-like objects.
The curve holds the CurveProfile struct and a new "Bevel Mode"
property decides which type of bevel to build, round, object, or
custom profile.
Although curves can already use another curve to make the bevel
geometry, this is a quicker way, and it also defines the profile of
just one corner of the bevel, so it isn't redundant. It's also nice
to have the same custom profile functionality wherever there is bevel.
Differential Revision: https://developer.blender.org/D8402
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_data_curve.py | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_curve.py b/release/scripts/startup/bl_ui/properties_data_curve.py index 7e7488f4cf1..1329f35d575 100644 --- a/release/scripts/startup/bl_ui/properties_data_curve.py +++ b/release/scripts/startup/bl_ui/properties_data_curve.py @@ -171,7 +171,7 @@ class DATA_PT_geometry_curve(CurveButtonsPanelCurve, Panel): col.prop(curve, "offset") sub = col.column() - sub.active = (curve.bevel_object is None) + sub.active = (curve.bevel_mode != 'OBJECT') sub.prop(curve, "extrude") col.prop(curve, "taper_object") @@ -193,21 +193,19 @@ class DATA_PT_geometry_curve_bevel(CurveButtonsPanelCurve, Panel): def draw(self, context): layout = self.layout - layout.use_property_split = True curve = context.curve + layout.prop(curve, "bevel_mode", expand=True) - col = layout.column() - sub = col.column() - sub.active = (curve.bevel_object is None) - sub.prop(curve, "bevel_depth", text="Depth") - sub.prop(curve, "bevel_resolution", text="Resolution") - - col.prop(curve, "bevel_object", text="Object") + layout.use_property_split = True - sub = col.column() - sub.active = curve.bevel_object is not None - sub.prop(curve, "use_fill_caps") + col = layout.column() + if curve.bevel_mode == 'OBJECT': + col.prop(curve, "bevel_object", text="Object") + else: + col.prop(curve, "bevel_depth", text="Depth") + col.prop(curve, "bevel_resolution", text="Resolution") + col.prop(curve, "use_fill_caps") if type(curve) is not TextCurve: @@ -218,13 +216,17 @@ class DATA_PT_geometry_curve_bevel(CurveButtonsPanelCurve, Panel): (curve.bevel_object is not None) ) sub = col.column(align=True) - sub.prop(curve, "bevel_factor_start", text="Bevel Start") + sub.prop(curve, "bevel_factor_start", text="Start") sub.prop(curve, "bevel_factor_end", text="End") sub = col.column(align=True) - sub.prop(curve, "bevel_factor_mapping_start", text="Bevel Mapping Start") + sub.prop(curve, "bevel_factor_mapping_start", text="Mapping Start") sub.prop(curve, "bevel_factor_mapping_end", text="End") + # Put the large template at the end so it doesn't displace the other properties + if curve.bevel_mode == 'PROFILE': + col.template_curveprofile(curve, "bevel_profile") + class DATA_PT_pathanim(CurveButtonsPanelCurve, Panel): bl_label = "Path Animation" |