[Bf-blender-cvs] [9c28e6e62f6] xr-actions-D9124: XR: Fix crash when reading "constraint" objects

Peter Kim noreply at git.blender.org
Tue Nov 3 10:50:53 CET 2020


Commit: 9c28e6e62f6bddeffc372d753355d8a2734b1f63
Author: Peter Kim
Date:   Tue Nov 3 10:46:42 2020 +0900
Branches: xr-actions-D9124
https://developer.blender.org/rB9c28e6e62f6bddeffc372d753355d8a2734b1f63

XR: Fix crash when reading "constraint" objects

Pointers were not being relinked from file.

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

M	source/blender/blenloader/intern/readfile.c

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index aaff92ac748..0ff77f36ef3 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -4575,6 +4575,9 @@ static void direct_link_wm_xr_data(BlendDataReader *reader, wmXrData *xr_data)
 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);
 }
 
 /** \} */



More information about the Bf-blender-cvs mailing list