diff options
| author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-09-06 18:23:47 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2017-09-06 18:23:47 +0300 |
| commit | e2f42ff907313c56f57486ba923c9eb957520550 (patch) | |
| tree | bc9dc0e948cc376e031735af8d234c4e8390d34a /release | |
| parent | b41d34040b45b6634c3e81c93003326a3bf1d49a (diff) | |
| parent | 82ede9de483426c3d88dc61afbb0b777c724b047 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/properties_data_modifier.py | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/release/scripts/startup/bl_ui/properties_data_modifier.py b/release/scripts/startup/bl_ui/properties_data_modifier.py index 8f6f4e7010f..e9dc5b214c6 100644 --- a/release/scripts/startup/bl_ui/properties_data_modifier.py +++ b/release/scripts/startup/bl_ui/properties_data_modifier.py @@ -747,6 +747,10 @@ class DATA_PT_modifiers(ModifierButtonsPanel, Panel): col.prop(md, "steps") col.prop(md, "render_steps") col.prop(md, "use_smooth_shade") + col.prop(md, "use_merge_vertices") + sub = col.column() + sub.active = md.use_merge_vertices + sub.prop(md, "merge_threshold") col = split.column() row = col.row() |