diff options
author | William Reynish <billrey> | 2018-06-01 17:58:42 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-06-01 18:14:06 +0300 |
commit | 15e5dbc2c3f3146d81b8e13cb4f3f518762034ab (patch) | |
tree | 4e43a56f2a9411c29fd480fbe9d91f247ecd133b /release | |
parent | 0706b410bd05cf9448e00b55e59e48a56682f84d (diff) |
UI: tweaks to viewport shading and overlay panel layouts.
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_ui/space_view3d.py | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 8e5ca798ac3..6010b1e209f 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -3552,12 +3552,14 @@ class VIEW3D_PT_shading(Panel): sub.active = shading.show_object_outline sub.prop(shading, "object_outline_color", text="") + col.prop(view, "show_world") + elif shading.type in ('MATERIAL'): col.row().template_icon_view(shading, "studio_light") if shading.studio_light_orientation == 'WORLD': col.row().prop(shading, "studiolight_rot_z") col.row().prop(shading, "studiolight_background") - col.row().prop(shading, "use_scene_light") + col.prop(shading, "use_scene_light") class VIEW3D_PT_overlay(Panel): @@ -3580,20 +3582,12 @@ class VIEW3D_PT_overlay(Panel): display_all = overlay.show_overlays col = layout.column() - col.prop(view, "show_world") - - col = layout.column() col.active = display_all - col.prop(overlay, "show_text", text="Text") - col.prop(overlay, "show_cursor", text="3D Cursor") col.prop(view, "show_manipulator", text="Manipulators") - if shading.type == "MATERIAL": - col.prop(overlay, "show_look_dev") - - col = layout.column() - col.active = display_all + col.prop(overlay, "show_text", text="Text") + col.prop(overlay, "show_cursor", text="3D Cursor") col.prop(overlay, "show_outline_selected") col.prop(overlay, "show_all_objects_origin") col.prop(overlay, "show_relationship_lines") @@ -3602,6 +3596,9 @@ class VIEW3D_PT_overlay(Panel): col.prop(overlay, "show_wireframes") col.prop(overlay, "show_backface_culling") + if shading.type == "MATERIAL": + col.prop(overlay, "show_look_dev") + col = layout.column() col.active = display_all split = col.split(percentage=0.55) @@ -3616,11 +3613,8 @@ class VIEW3D_PT_overlay(Panel): sub.active = bool(overlay.show_floor or view.region_quadviews or not view.region_3d.is_perspective) subsub = sub.column(align=True) subsub.active = overlay.show_floor - subsub.prop(overlay, "grid_lines", text="Lines") sub.prop(overlay, "grid_scale", text="Scale") - subsub = sub.column(align=True) - subsub.active = scene.unit_settings.system == 'NONE' - subsub.prop(overlay, "grid_subdivisions", text="Subdivisions") + sub.prop(overlay, "grid_subdivisions", text="Subdivisions") if context.mode == 'EDIT_MESH': col.separator() |