[Bf-blender-cvs] [b518744] master: Fix T49804: Display grid Scale/Subdivision are sometimes disabled in View3D when they should not.

Bastien Montagne noreply at git.blender.org
Fri Oct 21 16:10:21 CEST 2016


Commit: b51874437d86a84684ed3327874285520cb886f4
Author: Bastien Montagne
Date:   Fri Oct 21 16:06:53 2016 +0200
Branches: master
https://developer.blender.org/rBb51874437d86a84684ed3327874285520cb886f4

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.

===================================================================

M	release/scripts/startup/bl_ui/space_view3d.py

===================================================================

diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py
index fad5214..8a3a5d3 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'




More information about the Bf-blender-cvs mailing list