[Bf-blender-cvs] [8ac7510a4d9] master: UI: Do not put walk navigation settings inside an if statement

[Aaron Carlisle]

Commit: 8ac7510a4d95b25b14686f10b2e2b0ef5b0f0e0d
Author: Aaron Carlisle
Date:   Mon Apr 10 17:44:03 2017 -0400
Branches: master
https://developer.blender.org/rB8ac7510a4d95b25b14686f10b2e2b0ef5b0f0e0d

UI: Do not put walk navigation settings inside an if statement

The issue here is that the preferences are still used because both can be accessed from the 3D View, view menu. In the future, it is likely that the old mode will be removed (maybe 2.8?) but for now we want to keep both operational.

Differential revision: https://developer.blender.org/D2320

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

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

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

diff --git a/release/scripts/startup/bl_ui/space_userpref.py b/release/scripts/startup/bl_ui/space_userpref.py
index e50beba50d8..5ed481a215a 100644
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@ -1222,23 +1222,25 @@ class USERPREF_PT_input(Panel):
         sub = col.column()
         sub.label(text="View Navigation:")
         sub.row().prop(inputs, "navigation_mode", expand=True)
-        if inputs.navigation_mode == 'WALK':
-            walk = inputs.walk_navigation
 
-            sub.prop(walk, "use_mouse_reverse")
-            sub.prop(walk, "mouse_speed")
-            sub.prop(walk, "teleport_time")
+        sub.label(text="Walk Navigation:")
 
-            sub = col.column(align=True)
-            sub.prop(walk, "walk_speed")
-            sub.prop(walk, "walk_speed_factor")
+        walk = inputs.walk_navigation
 
-            sub.separator()
-            sub.prop(walk, "use_gravity")
-            sub = col.column(align=True)
-            sub.active = walk.use_gravity
-            sub.prop(walk, "view_height")
-            sub.prop(walk, "jump_height")
+        sub.prop(walk, "use_mouse_reverse")
+        sub.prop(walk, "mouse_speed")
+        sub.prop(walk, "teleport_time")
+
+        sub = col.column(align=True)
+        sub.prop(walk, "walk_speed")
+        sub.prop(walk, "walk_speed_factor")
+
+        sub.separator()
+        sub.prop(walk, "use_gravity")
+        sub = col.column(align=True)
+        sub.active = walk.use_gravity
+        sub.prop(walk, "view_height")
+        sub.prop(walk, "jump_height")
 
         if inputs.use_ndof:
             col.separator()