diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-02-03 22:47:15 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-02-03 22:47:15 +0400 |
commit | d273420690541a0c8442d5c6d99f24ea5785e1f4 (patch) | |
tree | a522f54b468eaa6dd643c44dcd4ebafdb930ce54 /release | |
parent | 3719942abbdc2bf045eef6cce879ecf232b4dd9d (diff) | |
parent | aeea1d394eef4aa8a41f545932cfae66a0487eba (diff) |
Merging r43848 through r43870 from trunk into soc-2011-tomato
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_data_curve.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_curve.py b/release/scripts/startup/bl_ui/properties_data_curve.py index 79d722eb19d..3aa995353b2 100644 --- a/release/scripts/startup/bl_ui/properties_data_curve.py +++ b/release/scripts/startup/bl_ui/properties_data_curve.py @@ -111,7 +111,7 @@ class DATA_PT_shape_curve(CurveButtonsPanel, Panel): sub = col.column() sub.active = (curve.dimensions == '2D' or (curve.bevel_object is None and curve.dimensions == '3D')) sub.prop(curve, "fill_mode", text="") - col.prop(curve, "use_fill_deform", text="Fill Deformed") + col.prop(curve, "use_fill_deform") class DATA_PT_curve_texture_space(CurveButtonsPanel, Panel): @@ -165,6 +165,10 @@ class DATA_PT_geometry_curve(CurveButtonsPanel, Panel): col.label(text="Bevel Object:") col.prop(curve, "bevel_object", text="") + row = col.row() + row.active = (curve.bevel_object is not None) + row.prop(curve, "use_fill_caps") + class DATA_PT_pathanim(CurveButtonsPanelCurve, Panel): bl_label = "Path Animation" |