[Bf-blender-cvs] [8d2119c0549] vr_scene_inspection: Cleanup: Rename anchor_object -> base_pose_object

[Julian Eisel]

Commit: 8d2119c0549052367c2fc5858f94288e91d8ed57
Author: Julian Eisel
Date:   Fri Feb 14 17:22:52 2020 +0100
Branches: vr_scene_inspection
https://developer.blender.org/rB8d2119c0549052367c2fc5858f94288e91d8ed57

Cleanup: Rename anchor_object -> base_pose_object

The term "anchor" is already used differently in the context of XR, so
rather avoid the ambiguity.

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

M	source/blender/blenloader/intern/readfile.c
M	source/blender/makesdna/DNA_xr_types.h
M	source/blender/makesrna/intern/rna_xr.c
M	source/blender/windowmanager/intern/wm_xr.c

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

diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index bd875826c3b..9207a42e0e2 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -7826,8 +7826,8 @@ static void direct_link_wm_xr_data(FileData *fd, wmXrData *xr_data)
 
 static void lib_link_wm_xr_data(FileData *fd, ID *parent_id, wmXrData *xr_data)
 {
-  xr_data->session_settings.anchor_object = newlibadr(
-      fd, parent_id->lib, xr_data->session_settings.anchor_object);
+  xr_data->session_settings.base_pose_object = newlibadr(
+      fd, parent_id->lib, xr_data->session_settings.base_pose_object);
 }
 
 #endif
diff --git a/source/blender/makesdna/DNA_xr_types.h b/source/blender/makesdna/DNA_xr_types.h
index 0eff72ae248..b633d97dd00 100644
--- a/source/blender/makesdna/DNA_xr_types.h
+++ b/source/blender/makesdna/DNA_xr_types.h
@@ -28,7 +28,7 @@ typedef struct bXrSessionSettings {
   struct View3DShading shading;
 
   /** Object to take the location and rotation as base position from. */
-  Object *anchor_object;
+  Object *base_pose_object;
 
   /** View3D draw flags (V3D_OFSDRAW_NONE, V3D_OFSDRAW_SHOW_ANNOTATION, ...). */
   char draw_flags;
diff --git a/source/blender/makesrna/intern/rna_xr.c b/source/blender/makesrna/intern/rna_xr.c
index 79abe00293d..ef5f11ed91b 100644
--- a/source/blender/makesrna/intern/rna_xr.c
+++ b/source/blender/makesrna/intern/rna_xr.c
@@ -83,7 +83,7 @@ static void rna_def_xr_session_settings(BlenderRNA *brna)
   RNA_def_property_ui_text(prop, "Shading Settings", "");
   RNA_def_property_update(prop, NC_WM | ND_XR_DATA_CHANGED, NULL);
 
-  prop = RNA_def_property(srna, "anchor_object", PROP_POINTER, PROP_NONE);
+  prop = RNA_def_property(srna, "base_pose_object", PROP_POINTER, PROP_NONE);
   RNA_def_property_flag(prop, PROP_EDITABLE);
   RNA_def_property_ui_text(
       prop, "Anchor Object", "Object to take the location and rotation as base position from");
diff --git a/source/blender/windowmanager/intern/wm_xr.c b/source/blender/windowmanager/intern/wm_xr.c
index 75f7bb18c61..7b959719729 100644
--- a/source/blender/windowmanager/intern/wm_xr.c
+++ b/source/blender/windowmanager/intern/wm_xr.c
@@ -225,9 +225,9 @@ static void wm_xr_runtime_session_state_update(bXrRuntimeSessionState *state,
                                          (settings->flag & XR_SESSION_USE_POSITION_TRACKING);
   const bool use_position_tracking = settings->flag & XR_SESSION_USE_POSITION_TRACKING;
 
-  if (settings->anchor_object) {
-    copy_v3_v3(state->reference_pose.position, settings->anchor_object->obmat[3]);
-    mat4_to_quat(state->reference_pose.orientation_quat, settings->anchor_object->obmat);
+  if (settings->base_pose_object) {
+    copy_v3_v3(state->reference_pose.position, settings->base_pose_object->obmat[3]);
+    mat4_to_quat(state->reference_pose.orientation_quat, settings->base_pose_object->obmat);
 
     copy_v3_v3(state->final_reference_pose.position, state->reference_pose.position);
   }