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:
authorBastien Montagne <montagne29@wanadoo.fr>2016-10-21 17:06:53 +0300
committerBastien Montagne <montagne29@wanadoo.fr>2016-10-21 17:06:53 +0300
commitb51874437d86a84684ed3327874285520cb886f4 (patch)
treeedfdda45ba93db24a6537d624c677a2dcd340186 /release
parentf7ce482385b760135a36ff778e8c3436cdcf5404 (diff)
Fix T49804: Display grid Scale/Subdivision are sometimes disabled in View3D when they should not.
Not really possible to precisely detect all cases in which they should or should not be active, but at least now it won't show as disabled when it actually has some effects.
Diffstat (limited to 'release')
-rw-r--r--release/scripts/startup/bl_ui/space_view3d.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index fad52143ae5..8a3a5d3b7e8 100644
--- a/release/scripts/startup/bl_ui/space_view3d.py
+++ b/release/scripts/startup/bl_ui/space_view3d.py
@@ -3231,8 +3231,10 @@ class VIEW3D_PT_view3d_display(Panel):
row.prop(view, "show_axis_z", text="Z", toggle=True)
sub = col.column(align=True)
- sub.active = (display_all and view.show_floor)
- sub.prop(view, "grid_lines", text="Lines")
+ sub.active = bool(view.show_floor or view.region_quadviews or not view.region_3d.is_perspective)
+ subsub = sub.column(align=True)
+ subsub.active = view.show_floor
+ subsub.prop(view, "grid_lines", text="Lines")
sub.prop(view, "grid_scale", text="Scale")
subsub = sub.column(align=True)
subsub.active = scene.unit_settings.system == 'NONE'