@@ -16,7 +16,7 @@ static PyObject *py_ue_uscriptstruct_get_field(ue_PyUScriptStruct *self, PyObjec
 	if (!u_property)
 		return PyErr_Format(PyExc_Exception, "unable to find property %s", name);
 
-	return ue_py_convert_property(u_property, self->data, index);
+	return ue_py_convert_property(u_property, self->u_struct_ptr, index);
 }
 
 static PyObject *py_ue_uscriptstruct_get_field_array_dim(ue_PyUScriptStruct *self, PyObject * args)
@@ -49,7 +49,7 @@ static PyObject *py_ue_uscriptstruct_set_field(ue_PyUScriptStruct *self, PyObjec
 		return PyErr_Format(PyExc_Exception, "unable to find property %s", name);
 
 
-	if (!ue_py_convert_pyobject(value, u_property, self->data, index))
+	if (!ue_py_convert_pyobject(value, u_property, self->u_struct_ptr, index))
 	{
 		return PyErr_Format(PyExc_Exception, "unable to set property %s", name);
 	}
@@ -80,7 +80,7 @@ static PyObject *py_ue_uscriptstruct_get_struct(ue_PyUScriptStruct *self, PyObje
 
 static PyObject *py_ue_uscriptstruct_clone(ue_PyUScriptStruct *self, PyObject * args)
 {
-	return py_ue_new_uscriptstruct(self->u_struct, self->data);
+	return py_ue_new_uscriptstruct(self->u_struct, self->u_struct_ptr);
 }
 
 PyObject *py_ue_uscriptstruct_as_dict(ue_PyUScriptStruct * self, PyObject * args)
 
@@ -5,13 +5,13 @@
 typedef struct
 {
 	PyObject_HEAD
-		/* Type-specific fields go here. */
-		UScriptStruct *u_struct;
-	uint8 *data;
-	// if 1, data points to un-owned memory
-	int is_ptr;
+	/* Type-specific fields go here. */
+	UScriptStruct *u_struct;
+	uint8 *u_struct_ptr;
 	// points to the original struct memory (do not try this at home !)
-	uint8 *original_data;
+	uint8 *original_ptr;
+	// if set, the struct is responsible for freeing memory
+	int u_struct_owned;
 } ue_PyUScriptStruct;
 
 PyObject *py_ue_new_uscriptstruct(UScriptStruct *, uint8 *);
 
@@ -38,7 +38,7 @@ PyObject *py_ue_data_table_add_row(ue_PyUObject * self, PyObject * args)
 	if (!row)
 		return PyErr_Format(PyExc_Exception, "unable to add row");
 	data_table->RowStruct->InitializeStruct(row);
-	data_table->RowStruct->CopyScriptStruct(row, u_struct->data);
+	data_table->RowStruct->CopyScriptStruct(row, u_struct->u_struct_ptr);
 
 	Py_RETURN_NONE;
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ static PyObject py_ue_uscriptstruct_get_field(ue_PyUScriptStruct self, PyObjec`
`16`	`16`	`if (!u_property)`
`17`	`17`	`return PyErr_Format(PyExc_Exception, "unable to find property %s", name);`
`18`	`18`
`19`		`- return ue_py_convert_property(u_property, self->data, index);`
	`19`	`+ return ue_py_convert_property(u_property, self->u_struct_ptr, index);`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`static PyObject py_ue_uscriptstruct_get_field_array_dim(ue_PyUScriptStruct self, PyObject * args)`
`@@ -49,7 +49,7 @@ static PyObject py_ue_uscriptstruct_set_field(ue_PyUScriptStruct self, PyObjec`
`49`	`49`	`return PyErr_Format(PyExc_Exception, "unable to find property %s", name);`
`50`	`50`
`51`	`51`
`52`		`- if (!ue_py_convert_pyobject(value, u_property, self->data, index))`
	`52`	`+ if (!ue_py_convert_pyobject(value, u_property, self->u_struct_ptr, index))`
`53`	`53`	`{`
`54`	`54`	`return PyErr_Format(PyExc_Exception, "unable to set property %s", name);`
`55`	`55`	`}`
`@@ -80,7 +80,7 @@ static PyObject py_ue_uscriptstruct_get_struct(ue_PyUScriptStruct self, PyObje`
`80`	`80`
`81`	`81`	`static PyObject py_ue_uscriptstruct_clone(ue_PyUScriptStruct self, PyObject * args)`
`82`	`82`	`{`
`83`		`- return py_ue_new_uscriptstruct(self->u_struct, self->data);`
	`83`	`+ return py_ue_new_uscriptstruct(self->u_struct, self->u_struct_ptr);`
`84`	`84`	`}`
`85`	`85`
`86`	`86`	`PyObject py_ue_uscriptstruct_as_dict(ue_PyUScriptStruct self, PyObject * args)`