[Bf-blender-cvs] [d5989308fb1] xr-controller-support: Fix build warnings

[Peter Kim]

Commit: d5989308fb1a156f1da04e56c62f56aac48d4973
Author: Peter Kim
Date:   Wed Jul 28 13:40:12 2021 +0900
Branches: xr-controller-support
https://developer.blender.org/rBd5989308fb1a156f1da04e56c62f56aac48d4973

Fix build warnings

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

M	intern/ghost/intern/GHOST_XrAction.cpp
M	intern/ghost/intern/GHOST_XrAction.h
M	source/blender/windowmanager/xr/intern/wm_xr_action.c
M	source/blender/windowmanager/xr/intern/wm_xr_session.c

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

diff --git a/intern/ghost/intern/GHOST_XrAction.cpp b/intern/ghost/intern/GHOST_XrAction.cpp
index e7941744755..dfd7172c9c6 100644
--- a/intern/ghost/intern/GHOST_XrAction.cpp
+++ b/intern/ghost/intern/GHOST_XrAction.cpp
@@ -32,8 +32,7 @@
  *
  * \{ */
 
-GHOST_XrActionSpace::GHOST_XrActionSpace(XrInstance instance,
-                                         XrSession session,
+GHOST_XrActionSpace::GHOST_XrActionSpace(XrSession session,
                                          XrAction action,
                                          const char *action_name,
                                          const char *profile_path,
@@ -139,8 +138,7 @@ GHOST_XrActionProfile::GHOST_XrActionProfile(XrInstance instance,
       }
       else if (is_pose_action) {
         /* Create action space for pose bindings. */
-        subaction.space = std::make_unique<GHOST_XrActionSpace>(instance,
-                                                                session,
+        subaction.space = std::make_unique<GHOST_XrActionSpace>(session,
                                                                 action,
                                                                 info.action_name,
                                                                 info.profile_path,
diff --git a/intern/ghost/intern/GHOST_XrAction.h b/intern/ghost/intern/GHOST_XrAction.h
index b323e32f875..099c99bf03a 100644
--- a/intern/ghost/intern/GHOST_XrAction.h
+++ b/intern/ghost/intern/GHOST_XrAction.h
@@ -35,8 +35,7 @@
 class GHOST_XrActionSpace {
  public:
   GHOST_XrActionSpace() = delete; /* Default constructor for map storage. */
-  GHOST_XrActionSpace(XrInstance instance,
-                      XrSession session,
+  GHOST_XrActionSpace(XrSession session,
                       XrAction action,
                       const char *action_name,
                       const char *profile_path,
diff --git a/source/blender/windowmanager/xr/intern/wm_xr_action.c b/source/blender/windowmanager/xr/intern/wm_xr_action.c
index fae0e3550a6..2e8d6f8e629 100644
--- a/source/blender/windowmanager/xr/intern/wm_xr_action.c
+++ b/source/blender/windowmanager/xr/intern/wm_xr_action.c
@@ -309,8 +309,8 @@ void WM_xr_action_destroy(wmXrData *xr, const char *action_set_name, const char
   }
 
   LISTBASE_FOREACH (LinkData *, ld, &action_set->active_modal_actions) {
-    wmXrAction *action = ld->data;
-    if (STREQ(action->name, action_name)) {
+    wmXrAction *active_modal_action = ld->data;
+    if (STREQ(active_modal_action->name, action_name)) {
       BLI_freelinkN(&action_set->active_modal_actions, ld);
       break;
     }
diff --git a/source/blender/windowmanager/xr/intern/wm_xr_session.c b/source/blender/windowmanager/xr/intern/wm_xr_session.c
index b5fe69aea3b..f8e9627799b 100644
--- a/source/blender/windowmanager/xr/intern/wm_xr_session.c
+++ b/source/blender/windowmanager/xr/intern/wm_xr_session.c
@@ -957,7 +957,7 @@ static wmXrHapticAction *wm_xr_session_haptic_action_find(ListBase *active_hapti
                                                           const char **subaction_path)
 {
   LISTBASE_FOREACH (wmXrHapticAction *, ha, active_haptic_actions) {
-    if (action == ha->action && subaction_path == ha->subaction_path) {
+    if ((action == ha->action) && (subaction_path == ha->subaction_path)) {
       return ha;
     }
   }