Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Bakker <j.bakker@atmind.nl>2019-04-17 12:35:20 +0300
committerJeroen Bakker <j.bakker@atmind.nl>2019-04-18 12:22:08 +0300
commit63bae864f40302b0a303498d26f230caf4f24339 (patch)
treeae87ecce8868b872d1f2403add5b9d4d5bf538c9 /release
parentf7a28f0e11be825e8b1f74720f4d0b35a2d0104b (diff)
Overlay Engine: Option to Disable AA Ortho Grid
When in Axis alligned orthographic view a grid was always displayed. With this change the user can enable/disable this grid. The Grid is always visible and editable, but only rendered active when user is in quad view, or axis aligned ortho view. Reviewers: brecht, fclem Maniphest Tasks: T63517 Differential Revision: https://developer.blender.org/D4699
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_view3d.py22
1 files changed, 13 insertions, 9 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index 06626c67bc9..9c326372f89 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -4836,15 +4836,19 @@ class VIEW3D_PT_overlay_guides(Panel):
split = col.split()
sub = split.column()
- sub.prop(overlay, "show_floor", text="Grid")
-
- if overlay.show_floor:
- sub = col.column(align=True)
- sub.active = bool(overlay.show_floor or view.region_quadviews or not view.region_3d.is_perspective)
- subsub = sub.row(align=True)
- subsub.active = overlay.show_floor
- subsub.prop(overlay, "grid_scale", text="Scale")
- subsub.prop(overlay, "grid_subdivisions", text="Subdivisions")
+
+ row = sub.row()
+ row_el = row.column()
+ row_el.prop(overlay, "show_ortho_grid", text="Grid")
+ grid_active = view.region_quadviews or (view.region_3d.is_orthographic_side_view and not view.region_3d.is_perspective)
+ row_el.active = grid_active
+ row.prop(overlay, "show_floor", text="Floor")
+
+ if overlay.show_floor or overlay.show_ortho_grid:
+ sub = col.row(align=True)
+ sub.active = (overlay.show_floor and not view.region_3d.is_orthographic_side_view) or (overlay.show_ortho_grid and grid_active)
+ sub.prop(overlay, "grid_scale", text="Scale")
+ sub.prop(overlay, "grid_subdivisions", text="Subdivisions")
sub = split.column()
row = sub.row()