diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-08 18:27:28 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-02-08 18:27:28 +0300 |
| commit | 92786141159430fa36e59e0229e4bbb84f2f04be (patch) | |
| tree | dd93e8f2a611ecbbc05646533798e97354d0f34e /release | |
| parent | bdc708762cf0fe0490bee3cf8452446da46d342a (diff) | |
| parent | e0597baed57fa7a9dfaf6dff6d0fa120784d21ea (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_data_modifier.py | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index 599b7c943a4..32a1b3a771d 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -153,11 +153,6 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): layout.row().prop(md, "offset_type", expand=True) def BOOLEAN(self, layout, ob, md): - solver = md.solver - if not bpy.app.build_options.mod_boolean: - if solver == 'CARVE': - layout.label("Built without Carve solver") - split = layout.split() col = split.column() @@ -168,15 +163,10 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): col.label(text="Object:") col.prop(md, "object", text="") - split = layout.split() - split.column().label(text="Solver:") - split.column().prop(md, "solver", text="") - - if solver == 'BMESH': - layout.prop(md, "double_threshold") + layout.prop(md, "double_threshold") - if bpy.app.debug: - layout.prop(md, "debug_options") + if bpy.app.debug: + layout.prop(md, "debug_options") def BUILD(self, layout, ob, md): |