Commit: f97ba497b9eae1dc04182036178bdd24dacf9672
Author: Peter Kim
Date: Sun Feb 20 18:19:39 2022 +0900
Branches: xr-dev
https://developer.blender.org/rBf97ba497b9eae1dc04182036178bdd24dacf9672
Cleanup: clang-format, warnings
===================================================================
M source/blender/windowmanager/xr/intern/wm_xr_mocap.c
M source/blender/windowmanager/xr/intern/wm_xr_session.c
===================================================================
diff --git a/source/blender/windowmanager/xr/intern/wm_xr_mocap.c
b/source/blender/windowmanager/xr/intern/wm_xr_mocap.c
index dc1c5128cc7..6192343705e 100644
--- a/source/blender/windowmanager/xr/intern/wm_xr_mocap.c
+++ b/source/blender/windowmanager/xr/intern/wm_xr_mocap.c
@@ -196,7 +196,7 @@ void wm_xr_mocap_object_autokey(
}
if (ED_transform_motionpath_need_update_object(scene, ob)) {
- ListBase lb = { NULL, NULL };
+ ListBase lb = {NULL, NULL};
BLI_addtail(&lb, BLI_genericNodeN(ob));
ED_objects_recalculate_paths(C, scene,
OBJECT_PATH_CALC_RANGE_CURRENT_FRAME, &lb);
diff --git a/source/blender/windowmanager/xr/intern/wm_xr_session.c
b/source/blender/windowmanager/xr/intern/wm_xr_session.c
index 030e92daa7a..4321e0f673e 100644
--- a/source/blender/windowmanager/xr/intern/wm_xr_session.c
+++ b/source/blender/windowmanager/xr/intern/wm_xr_session.c
@@ -1224,6 +1224,7 @@ void wm_xr_session_actions_update(const bContext *C)
Scene *scene = CTX_data_scene(C);
ViewLayer *view_layer = CTX_data_view_layer(C);
bScreen *screen_anim = ED_screen_animation_playing(wm);
+ bool notify = true;
wm_xr_mocap_objects_update(XR_HEADSET_PATH,
&state->viewer_pose,
(bContext *)C,
@@ -1232,7 +1233,7 @@ void wm_xr_session_actions_update(const bContext *C)
view_layer,
win,
screen_anim,
- true);
+ ¬ify);
}
const bool synced = GHOST_XrSyncActions(xr_context,
@@ -1243,8 +1244,6 @@ void wm_xr_session_actions_update(const bContext *C)
/* Only update controller data and dispatch events for active action set. */
if (active_action_set) {
- wmWindow *win = wm_xr_session_root_window_or_fallback_get(wm, xr->runtime);
-
if (active_action_set->controller_grip_action &&
active_action_set->controller_aim_action) {
wm_xr_session_controller_data_update(active_action_set->controller_grip_action,
active_action_set->controller_aim_action,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs