[Bf-blender-cvs] [e790f1a8dc1] master: Merge branch 'blender-v2.83-release'

[Philipp Oeser]

Commit: e790f1a8dc18cdc2906d2cf415271b1d91baca14
Author: Philipp Oeser
Date:   Tue May 26 14:24:50 2020 +0200
Branches: master
https://developer.blender.org/rBe790f1a8dc18cdc2906d2cf415271b1d91baca14

Merge branch 'blender-v2.83-release'

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



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

diff --cc release/scripts/startup/bl_ui/space_userpref.py
index 3baedd889e0,8686c6a2327..5a36f6bb081
--- a/release/scripts/startup/bl_ui/space_userpref.py
+++ b/release/scripts/startup/bl_ui/space_userpref.py
@@@ -1631,7 -1654,7 +1631,6 @@@ class USERPREF_PT_ndof_settings(Panel)
          layout.use_property_decorate = False  # No animation.
  
          input_prefs = context.preferences.inputs
--
          is_view3d = context.space_data.type == 'VIEW_3D'
          self.draw_settings(layout, input_prefs, is_view3d)