[Bf-blender-cvs] [e968bbc5d89] soc-2019-openxr: Fix wrong enum-type used for switch
Julian Eisel
noreply at git.blender.org
Thu Jun 6 17:38:00 CEST 2019
Commit: e968bbc5d890f8cc0b200af7ed3f32399564a6a5
Author: Julian Eisel
Date: Thu Jun 6 17:37:18 2019 +0200
Branches: soc-2019-openxr
https://developer.blender.org/rBe968bbc5d890f8cc0b200af7ed3f32399564a6a5
Fix wrong enum-type used for switch
Why doesn't MSVC warn about this, grr...
===================================================================
M source/blender/windowmanager/intern/wm_xr.c
===================================================================
diff --git a/source/blender/windowmanager/intern/wm_xr.c b/source/blender/windowmanager/intern/wm_xr.c
index ef5ba83449b..d7b44c833ec 100644
--- a/source/blender/windowmanager/intern/wm_xr.c
+++ b/source/blender/windowmanager/intern/wm_xr.c
@@ -296,9 +296,9 @@ void wm_xr_session_end(wmXRContext *xr_context)
static void wm_xr_session_state_change(wmXRContext *xr_context,
const XrEventDataSessionStateChanged *lifecycle)
{
- xr_context->oxr.session_state = lifecycle->type;
+ xr_context->oxr.session_state = lifecycle->state;
- switch (lifecycle->type) {
+ switch (lifecycle->state) {
case XR_SESSION_STATE_READY: {
XrSessionBeginInfo begin_info = {
.type = XR_TYPE_SESSION_BEGIN_INFO,
@@ -310,6 +310,8 @@ static void wm_xr_session_state_change(wmXRContext *xr_context,
BLI_assert(xr_context->oxr.session != XR_NULL_HANDLE);
xrEndSession(xr_context->oxr.session);
}
+ default:
+ break;
}
}
@@ -339,7 +341,7 @@ bool wm_xr_events_handle(wmXRContext *xr_context)
return true;
default:
- printf("Unhandled event: %i\n", event->type);
+ printf("Unhandled event: %u\n", event->type);
return false;
}
}
More information about the Bf-blender-cvs
mailing list