Change how 'Main' collection type definitons work so that 'self' can be used without overriding the srna type.

1 files changed, 10 insertions, 0 deletions

diff --git a/source/blender/makesrna/RNA_types.h b/source/blender/makesrna/RNA_types.h
index 4e60fb413db..841f8708aa2 100644
--- a/source/blender/makesrna/RNA_types.h
+++ b/source/blender/makesrna/RNA_types.h
@@ -323,6 +323,16 @@ typedef struct ExtensionRNA {
 	void (*free)(void *data);
 } ExtensionRNA;
 
+/* fake struct definitions, needed otherwise collections end up owning the C
+ * structs like 'Object' when defined first */
+#define MainCameras Main
+#define MainScenes Main
+#define MainArmatures Main
+#define MainMaterials Main
+#define MainMeshes Main
+#define MainLamps Main
+#define MainObjects Main
+
 #ifdef __cplusplus
 }
 #endif