diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2016-07-13 17:50:23 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2016-07-13 17:50:23 +0300 |
commit | 2f596756b79e526e9df6ac93373094ee45fd3323 (patch) | |
tree | f1380edc7b292212720fff09473cce9fa24f724f /release/scripts | |
parent | 56ad4520cda00a6b75a6ae475510ce14c2574631 (diff) | |
parent | 029de800a4cfdaef3f3e01277482baeaf57a5f89 (diff) |
Merge branch 'master' into strand_editmode
Diffstat (limited to 'release/scripts')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_data_modifier.py | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index 7863c075344..c6bb6ccf05f 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -151,21 +151,16 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): col = split.column() col.label(text="Operation:") col.prop(md, "operation", text="") + row = layout.row() + row.label("Solver:") + row.prop(md, "solver", expand=True) col = split.column() col.label(text="Object:") col.prop(md, "object", text="") - """ - layout.prop(md, "use_bmesh") - if md.use_bmesh: - box = layout.box() - box.label("BMesh Options:") - box.prop(md, "use_bmesh_separate") - box.prop(md, "use_bmesh_dissolve") - box.prop(md, "use_bmesh_connect_regions") - box.prop(md, "threshold") - """ + if md.solver == 'BMESH': + layout.prop(md, "double_threshold") def BUILD(self, layout, ob, md): split = layout.split() |