diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-06-21 16:02:38 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-06-21 16:02:38 +0300 |
| commit | c054a1a84867e652cd737cdab7ca790b6e038303 (patch) | |
| tree | 34dc2614a32aad4dd3ad8afc5df8768edededaae /release | |
| parent | d5552a6d4ba5bb4ac34fe149c2ac9d7ff3f723fe (diff) | |
| parent | a4f08297ed3c201c66a340e5261cac0aeb68b523 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/startup/bl_ui/space_userpref.py | 1 | ||||
| -rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py index 6baca880ce3..4749eb7690c 100644 --- a/release/scripts/startup/bl_ui/space_userpref.py +++ b/release/scripts/startup/bl_ui/space_userpref.py @@ -231,6 +231,7 @@ class USERPREF_PT_interface(Panel): col.prop(view, "ui_line_width", text="Line Width") col.prop(view, "show_tooltips") col.prop(view, "show_tooltips_python") + col.prop(view, "show_developer_ui") col.prop(view, "show_object_info", text="Object Info") col.prop(view, "show_large_cursors") col.prop(view, "show_view_name", text="View Name") diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 804da7ede78..2aaeba653fb 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -3845,6 +3845,7 @@ class VIEW3D_PT_overlay_edit_mesh(Panel): data = context.active_object.data statvis = tool_settings.statvis with_freestyle = bpy.app.build_options.freestyle + show_developer_ui = context.user_preferences.view.show_developer_ui col = layout.column() col.active = display_all @@ -3867,7 +3868,7 @@ class VIEW3D_PT_overlay_edit_mesh(Panel): sub.prop(data, "show_extra_face_area", text="Face Area") sub.prop(data, "show_extra_face_angle", text="Face Angle") - if bpy.app.debug: + if show_developer_ui: sub.prop(data, "show_extra_indices", text="Indices") if with_freestyle: |