Commit: 848c87c6d97d6062a0655b50efb9c87d55d4ffde
Author: Peter Kim
Date: Fri Nov 6 21:46:56 2020 +0900
Branches: xr-actions-D9124
https://developer.blender.org/rB848c87c6d97d6062a0655b50efb9c87d55d4ffde
Fix errors after merge
===================================================================
M source/blender/blenloader/intern/readfile.c
M source/blender/windowmanager/intern/wm.c
===================================================================
diff --git a/source/blender/blenloader/intern/readfile.c
b/source/blender/blenloader/intern/readfile.c
index 6e29d919646..1692650f2d5 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4526,9 +4526,6 @@ static void direct_link_scene(BlendDataReader *reader,
Scene *sce)
/** \} */
/* -------------------------------------------------------------------- */
- BLO_read_id_address(reader, parent_id->lib,
&xr_data->session_settings.headset_object);
- BLO_read_id_address(reader, parent_id->lib,
&xr_data->session_settings.controller0_object);
- BLO_read_id_address(reader, parent_id->lib,
&xr_data->session_settings.controller1_object);
/** \name Read ID: Screen
* \{ */
diff --git a/source/blender/windowmanager/intern/wm.c
b/source/blender/windowmanager/intern/wm.c
index a10284e9740..75a1f215415 100644
--- a/source/blender/windowmanager/intern/wm.c
+++ b/source/blender/windowmanager/intern/wm.c
@@ -224,6 +224,9 @@ static void window_manager_blend_read_data(BlendDataReader
*reader, ID *id)
static void lib_link_wm_xr_data(BlendLibReader *reader, ID *parent_id,
wmXrData *xr_data)
{
BLO_read_id_address(reader, parent_id->lib,
&xr_data->session_settings.base_pose_object);
+ BLO_read_id_address(reader, parent_id->lib,
&xr_data->session_settings.headset_object);
+ BLO_read_id_address(reader, parent_id->lib,
&xr_data->session_settings.controller0_object);
+ BLO_read_id_address(reader, parent_id->lib,
&xr_data->session_settings.controller1_object);
}
static void lib_link_workspace_instance_hook(BlendLibReader *reader,
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
