[Bf-extensions-cvs] [633e707c] xr-dev: Merge branch 'master' into xr-dev

[Peter Kim]

Commit: 633e707c40ad94d75a5f0c23ad5f5df0514fc92d
Author: Peter Kim
Date:   Thu Jun 9 07:06:34 2022 +0900
Branches: xr-dev
https://developer.blender.org/rBA633e707c40ad94d75a5f0c23ad5f5df0514fc92d

Merge branch 'master' into xr-dev

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



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

diff --cc viewport_vr_preview/action_map.py
index cbd16fc2,ed3dbe82..d5055b76
--- a/viewport_vr_preview/action_map.py
+++ b/viewport_vr_preview/action_map.py
@@@ -1,10 -1,7 +1,8 @@@
  # SPDX-License-Identifier: GPL-2.0-or-later
  
- # <pep8 compliant>
- 
  if "bpy" in locals():
      import importlib
 +    importlib.reload(action_map_io)
      importlib.reload(defaults)
  else:
      from . import action_map_io, defaults
diff --cc viewport_vr_preview/gui.py
index 503e3fc4,d9adfb95..747d5242
--- a/viewport_vr_preview/gui.py
+++ b/viewport_vr_preview/gui.py
@@@ -1,13 -1,10 +1,11 @@@
  # SPDX-License-Identifier: GPL-2.0-or-later
  
- # <pep8 compliant>
- 
  if "bpy" in locals():
      import importlib
 +    importlib.reload(action_map)
      importlib.reload(properties)
  else:
 -    from . import properties
 +    from . import action_map, properties
  
  import bpy
  from bpy.types import (
diff --cc viewport_vr_preview/operators.py
index b9151328,3c92a44f..735d2bd9
--- a/viewport_vr_preview/operators.py
+++ b/viewport_vr_preview/operators.py
@@@ -1,14 -1,10 +1,12 @@@
  # SPDX-License-Identifier: GPL-2.0-or-later
  
- # <pep8 compliant>
- 
  if "bpy" in locals():
      import importlib
 +    importlib.reload(action_map)
 +    importlib.reload(defaults)
      importlib.reload(properties)
  else:
 -    from . import properties
 +    from . import action_map, defaults, properties
  
  import bpy
  from bpy.types import (