[Bf-blender-cvs] [a87b142e51c] xr-actions-D9124: Fix build errors after merge

[Peter Kim]

Commit: a87b142e51c4242d97614c2709f51b583008a1f8
Author: Peter Kim
Date:   Sun Jan 17 19:19:41 2021 +0900
Branches: xr-actions-D9124
https://developer.blender.org/rBa87b142e51c4242d97614c2709f51b583008a1f8

Fix build errors after merge

Also fixes incorrect use of RNA_def_struct_name_property().

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

M	source/blender/makesrna/intern/rna_wm.c
M	source/blender/windowmanager/xr/intern/wm_xr_session.c

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

diff --git a/source/blender/makesrna/intern/rna_wm.c b/source/blender/makesrna/intern/rna_wm.c
index 3ee98284b52..f3395246880 100644
--- a/source/blender/makesrna/intern/rna_wm.c
+++ b/source/blender/makesrna/intern/rna_wm.c
@@ -3019,7 +3019,6 @@ static void rna_def_keyconfig(BlenderRNA *brna)
                                 "rna_wmKeyMapItem_xr_action_set_get",
                                 "rna_wmKeyMapItem_xr_action_set_length",
                                 "rna_wmKeyMapItem_xr_action_set_set");
-  RNA_def_struct_name_property(srna, prop);
   RNA_def_property_update(prop, 0, "rna_KeyMapItem_update");
 
   prop = RNA_def_property(srna, "xr_action", PROP_STRING, PROP_NONE);
@@ -3029,7 +3028,6 @@ static void rna_def_keyconfig(BlenderRNA *brna)
                                 "rna_wmKeyMapItem_xr_action_get",
                                 "rna_wmKeyMapItem_xr_action_length",
                                 "rna_wmKeyMapItem_xr_action_set");
-  RNA_def_struct_name_property(srna, prop);
   RNA_def_property_update(prop, 0, "rna_KeyMapItem_update");
 
   prop = RNA_def_property(srna, "repeat", PROP_BOOLEAN, PROP_NONE);
diff --git a/source/blender/windowmanager/xr/intern/wm_xr_session.c b/source/blender/windowmanager/xr/intern/wm_xr_session.c
index ca129a14ab0..cbd60395a36 100644
--- a/source/blender/windowmanager/xr/intern/wm_xr_session.c
+++ b/source/blender/windowmanager/xr/intern/wm_xr_session.c
@@ -32,6 +32,7 @@
 #include "DEG_depsgraph.h"
 
 #include "DNA_camera_types.h"
+#include "DNA_object_types.h"
 
 #include "DRW_engine.h"