[Bf-blender-cvs] [4423ab787b4] xr-actions-D9124: XR: Improve error logs when creating actions

[Peter Kim]

Commit: 4423ab787b421d0af6787fc516353d815b2c3f98
Author: Peter Kim
Date:   Sun Nov 22 18:29:14 2020 +0900
Branches: xr-actions-D9124
https://developer.blender.org/rB4423ab787b421d0af6787fc516353d815b2c3f98

XR: Improve error logs when creating actions

Include action set name in case multiple action sets have an action
with the same name.

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

M	intern/ghost/intern/GHOST_XrSession.cpp

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

diff --git a/intern/ghost/intern/GHOST_XrSession.cpp b/intern/ghost/intern/GHOST_XrSession.cpp
index a0fef131ed2..dfea506a57a 100644
--- a/intern/ghost/intern/GHOST_XrSession.cpp
+++ b/intern/ghost/intern/GHOST_XrSession.cpp
@@ -748,6 +748,7 @@ bool GHOST_XrSession::createActions(const char *action_set_name,
     CHECK_XR(
         xrCreateAction(action_set->set, &action_info, &action.action),
         (m_error_msg = std::string("Failed to create action \"") + info.name +
+                       "\" for action set \"" + action_set_name +
                        "\". Action name and/or paths are invalid. Name must not contain upper "
                        "case letters or special characters other than '-', '_', or '.'.")
             .c_str());
@@ -788,9 +789,10 @@ void GHOST_XrSession::destroyActions(const char *action_set_name,
                               "\" for action \"" + action_name + "\".")
                    .c_str());
     }
-    CHECK_XR(
-        xrDestroyAction(action->action),
-        (m_error_msg = std::string("Failed to destroy action \"") + action_name + "\".").c_str());
+    CHECK_XR(xrDestroyAction(action->action),
+             (m_error_msg = std::string("Failed to destroy action \"") + action_name +
+                            "\" for action set \"" + action_set_name + "\".")
+                 .c_str());
 
     actions.erase(action_name);
   }