diff options
author | Campbell Barton <ideasman42@gmail.com> | 2018-09-26 03:28:23 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-26 03:28:23 +0300 |
commit | c72380a427a4af9cacafc0e6bfe8f0f40c8e6dc5 (patch) | |
tree | 5aec87124965bf543d1edc918f7c5bcd8c1cb9bb /release/scripts/startup/bl_ui/properties_data_metaball.py | |
parent | c29d18c4c855025a0234435cc05dfad78d3d555f (diff) | |
parent | fcf3aa90daed0dde8c770857990f92c6601f8096 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_data_metaball.py')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_data_metaball.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_metaball.py b/release/scripts/startup/bl_ui/properties_data_metaball.py index 75015a57f5f..267577ae3b4 100644 --- a/release/scripts/startup/bl_ui/properties_data_metaball.py +++ b/release/scripts/startup/bl_ui/properties_data_metaball.py @@ -106,6 +106,7 @@ class DATA_PT_metaball_element(DataButtonsPanel, Panel): col.separator() col.prop(metaelem, "stiffness", text="Stiffness") + col.prop(metaelem, "radius", text="Radius") col.prop(metaelem, "use_negative", text="Negative") col.prop(metaelem, "hide", text="Hide") @@ -116,7 +117,7 @@ class DATA_PT_metaball_element(DataButtonsPanel, Panel): sub.prop(metaelem, "size_y", text="Y") sub.prop(metaelem, "size_z", text="Z") - elif metaelem.type == 'TUBE': + elif metaelem.type == 'CAPSULE': sub.prop(metaelem, "size_x", text="Size X") elif metaelem.type == 'PLANE': |