align weakref list for rna (properties were using wrong pointer)

1 files changed, 12 insertions, 7 deletions

diff --git a/source/blender/python/intern/bpy_rna.h b/source/blender/python/intern/bpy_rna.h
index 77f1fa3b336..aa8eaf3601a 100644
--- a/source/blender/python/intern/bpy_rna.h
+++ b/source/blender/python/intern/bpy_rna.h
@@ -72,40 +72,45 @@ extern PyTypeObject pyrna_prop_collection_Type;
 #define PYRNA_STRUCT_IS_VALID(pysrna) (((BPy_StructRNA *)(pysrna))->ptr.type != NULL)
 #define PYRNA_PROP_IS_VALID(pysrna) (((BPy_PropertyRNA *)(pysrna))->ptr.type != NULL)
 
+/* 'in_weakreflist' MUST be aligned */
+
 typedef struct {
 	PyObject_HEAD /* required python macro   */
+#ifdef USE_WEAKREFS
+	PyObject *in_weakreflist;
+#endif
 	PointerRNA	ptr;
 } BPy_DummyPointerRNA;
 
 typedef struct {
 	PyObject_HEAD /* required python macro   */
-	PointerRNA ptr;
-	int freeptr; /* needed in some cases if ptr.data is created on the fly, free when deallocing */
 #ifdef USE_WEAKREFS
 	PyObject *in_weakreflist;
 #endif
+	PointerRNA ptr;
+	int freeptr; /* needed in some cases if ptr.data is created on the fly, free when deallocing */
 } BPy_StructRNA;
 
 typedef struct {
 	PyObject_HEAD /* required python macro   */
-	PointerRNA ptr;
-	PropertyRNA *prop;
 #ifdef USE_WEAKREFS
 	PyObject *in_weakreflist;
 #endif
+	PointerRNA ptr;
+	PropertyRNA *prop;
 } BPy_PropertyRNA;
 
 typedef struct {
 	PyObject_HEAD /* required python macro   */
+#ifdef USE_WEAKREFS
+	PyObject *in_weakreflist;
+#endif
 	PointerRNA ptr;
 	PropertyRNA *prop;
 
 	/* Arystan: this is a hack to allow sub-item r/w access like: face.uv[n][m] */
 	int arraydim; /* array dimension, e.g: 0 for face.uv, 2 for face.uv[n][m], etc. */
 	int arrayoffset; /* array first item offset, e.g. if face.uv is [4][2], arrayoffset for face.uv[n] is 2n */
-#ifdef USE_WEAKREFS
-	PyObject *in_weakreflist;
-#endif
 } BPy_PropertyArrayRNA;
 
 /* cheap trick */