Commit: 9c34391e0c83fc77828aea931a61e2cfbbe541d3
Author: Jeroen Bakker
Date: Fri Nov 6 08:23:13 2020 +0100
Branches: master
https://developer.blender.org/rB9c34391e0c83fc77828aea931a61e2cfbbe541d3
Fix compilation error in GHOST
ELEM macro isn't available in GHOST library.
===================================================================
M intern/ghost/intern/GHOST_XrSession.cpp
===================================================================
diff --git a/intern/ghost/intern/GHOST_XrSession.cpp
b/intern/ghost/intern/GHOST_XrSession.cpp
index d4e35f80ed9..73b73a8f046 100644
--- a/intern/ghost/intern/GHOST_XrSession.cpp
+++ b/intern/ghost/intern/GHOST_XrSession.cpp
@@ -222,7 +222,7 @@ GHOST_XrSession::LifeExpectancy
GHOST_XrSession::handleStateChangeEvent(
m_oxr->session_state = lifecycle.state;
/* Runtime may send events for apparently destroyed session. Our handle
should be NULL then. */
- assert(ELEM(m_oxr->session, XR_NULL_HANDLE, lifecycle.session));
+ assert(m_oxr->session == XR_NULL_HANDLE || m_oxr->session ==
lifecycle.session);
switch (lifecycle.state) {
case XR_SESSION_STATE_READY: {
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
