diff options
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_data_curve.py | 21 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_curve.c | 9 |
2 files changed, 18 insertions, 12 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_curve.py b/release/scripts/startup/bl_ui/properties_data_curve.py index 91230c9dc89..fb365ea1fa4 100644 --- a/release/scripts/startup/bl_ui/properties_data_curve.py +++ b/release/scripts/startup/bl_ui/properties_data_curve.py @@ -113,6 +113,14 @@ class DATA_PT_shape_curve(CurveButtonsPanel, Panel): sub.prop(curve, "fill_mode", text="") col.prop(curve, "use_fill_deform") + if is_curve: + col.label(text="Path / Curve-Deform:") + sub = col.column() + rowsub = sub.row() + rowsub.prop(curve, "use_radius") + rowsub.prop(curve, "use_stretch") + sub.prop(curve, "use_deform_bounds") + class DATA_PT_curve_texture_space(CurveButtonsPanel, Panel): bl_label = "Texture Space" @@ -189,16 +197,11 @@ class DATA_PT_pathanim(CurveButtonsPanelCurve, Panel): layout.prop(curve, "path_duration", text="Frames") layout.prop(curve, "eval_time") - split = layout.split() - - col = split.column() - col.prop(curve, "use_path_follow") - col.prop(curve, "use_stretch") - col.prop(curve, "use_deform_bounds") - col = split.column() - col.prop(curve, "use_radius") - col.prop(curve, "use_time_offset", text="Offset Children") + # these are for paths only + row = layout.row() + row.prop(curve, "use_path_follow") + row.prop(curve, "use_time_offset", text="Offset Children") class DATA_PT_active_spline(CurveButtonsPanelActive, Panel): diff --git a/source/blender/makesrna/intern/rna_curve.c b/source/blender/makesrna/intern/rna_curve.c index 088f2dba0bb..91d3c3a0d3f 100644 --- a/source/blender/makesrna/intern/rna_curve.c +++ b/source/blender/makesrna/intern/rna_curve.c @@ -849,12 +849,14 @@ static void rna_def_path(BlenderRNA *brna, StructRNA *srna) prop= RNA_def_property(srna, "use_stretch", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_STRETCH); - RNA_def_property_ui_text(prop, "Stretch", "Option for curve-deform: make deformed child to stretch along entire path"); + RNA_def_property_ui_text(prop, "Stretch", "Option for curve-deform: " + "make deformed child to stretch along entire path"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); prop= RNA_def_property(srna, "use_deform_bounds", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", CU_DEFORM_BOUNDS_OFF); - RNA_def_property_ui_text(prop, "Bounds Clamp", "Use the mesh bounds to clamp the deformation"); + RNA_def_property_ui_text(prop, "Bounds Clamp", "Option for curve-deform: " + "Use the mesh bounds to clamp the deformation"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); prop= RNA_def_property(srna, "use_time_offset", PROP_BOOLEAN, PROP_NONE); @@ -864,7 +866,8 @@ static void rna_def_path(BlenderRNA *brna, StructRNA *srna) prop= RNA_def_property(srna, "use_radius", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", CU_PATH_RADIUS); - RNA_def_property_ui_text(prop, "Radius", "Option for paths: apply the curve radius with path following it and deforming"); + RNA_def_property_ui_text(prop, "Radius", "Option for paths and curve-deform: " + "apply the curve radius with path following it and deforming"); RNA_def_property_update(prop, 0, "rna_Curve_update_data"); } |