fixed user defined struct

Roberto De Ioris · Roberto De Ioris · commit 16ff08583ccc · 2018-07-19T09:35:14.000+02:00
diff --git a/Source/UnrealEnginePython/Private/UEPyUScriptStruct.cpp b/Source/UnrealEnginePython/Private/UEPyUScriptStruct.cpp
@@ -355,6 +355,18 @@ PyObject *py_ue_new_uscriptstruct(UScriptStruct *u_struct, uint8 *data)
 	return (PyObject *)ret;
 }
 
+PyObject *py_ue_new_owned_uscriptstruct(UScriptStruct *u_struct, uint8 *data)
+{
+	ue_PyUScriptStruct *ret = (ue_PyUScriptStruct *)PyObject_New(ue_PyUScriptStruct, &ue_PyUScriptStructType);
+	ret->u_struct = u_struct;
+	uint8 *struct_data = (uint8*)FMemory::Malloc(u_struct->GetStructureSize());
+	ret->u_struct->InitializeStruct(struct_data);
+	ret->u_struct->CopyScriptStruct(struct_data, data);
+	ret->u_struct_ptr = struct_data;
+	ret->u_struct_owned = 1;
+	return (PyObject *)ret;
+}
+
 static PyObject *py_ue_uscriptstruct_clone(ue_PyUScriptStruct *self, PyObject * args)
 {
 	ue_PyUScriptStruct *ret = (ue_PyUScriptStruct *)PyObject_New(ue_PyUScriptStruct, &ue_PyUScriptStructType);
diff --git a/Source/UnrealEnginePython/Private/UEPyUScriptStruct.h b/Source/UnrealEnginePython/Private/UEPyUScriptStruct.h
@@ -13,6 +13,7 @@ typedef struct
 } ue_PyUScriptStruct;
 
 PyObject *py_ue_new_uscriptstruct(UScriptStruct *, uint8 *);
+PyObject *py_ue_new_owned_uscriptstruct(UScriptStruct *, uint8 *);
 ue_PyUScriptStruct *py_ue_is_uscriptstruct(PyObject *);
 
 UProperty *ue_struct_get_field_from_name(UScriptStruct *, char *);
diff --git a/Source/UnrealEnginePython/Private/UObject/UEPyUserDefinedStruct.cpp b/Source/UnrealEnginePython/Private/UObject/UEPyUserDefinedStruct.cpp
@@ -33,7 +33,7 @@ PyObject *py_ue_struct_add_variable(ue_PyUObject * self, PyObject * args)
 
 	FStructureEditorUtils::OnStructureChanged(u_struct, FStructureEditorUtils::EStructureEditorChangeInfo::AddedVariable);
 
-	return py_ue_new_uscriptstruct(FindObject<UScriptStruct>(ANY_PACKAGE, UTF8_TO_TCHAR((char *)"Guid")), (uint8 *)&var->VarGuid);
+	return py_ue_new_owned_uscriptstruct(FindObject<UScriptStruct>(ANY_PACKAGE, UTF8_TO_TCHAR((char *)"Guid")), (uint8 *)&var->VarGuid);
 }
 
 PyObject *py_ue_struct_get_variables(ue_PyUObject * self, PyObject * args)
@@ -50,7 +50,7 @@ PyObject *py_ue_struct_get_variables(ue_PyUObject * self, PyObject * args)
 	PyObject *py_list = PyList_New(0);
 	for (FStructVariableDescription description : variables)
 	{
-		PyList_Append(py_list, py_ue_new_uscriptstruct(FStructVariableDescription::StaticStruct(), (uint8*)&description));
+		PyList_Append(py_list, py_ue_new_owned_uscriptstruct(FStructVariableDescription::StaticStruct(), (uint8*)&description));
 	}
 	return py_list;
 }

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ PyObject py_ue_struct_add_variable(ue_PyUObject self, PyObject * args)`
`33`	`33`
`34`	`34`	`FStructureEditorUtils::OnStructureChanged(u_struct, FStructureEditorUtils::EStructureEditorChangeInfo::AddedVariable);`
`35`	`35`
`36`		`- return py_ue_new_uscriptstruct(FindObject<UScriptStruct>(ANY_PACKAGE, UTF8_TO_TCHAR((char )"Guid")), (uint8 )&var->VarGuid);`
	`36`	`+ return py_ue_new_owned_uscriptstruct(FindObject<UScriptStruct>(ANY_PACKAGE, UTF8_TO_TCHAR((char )"Guid")), (uint8 )&var->VarGuid);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`PyObject py_ue_struct_get_variables(ue_PyUObject self, PyObject * args)`
`@@ -50,7 +50,7 @@ PyObject py_ue_struct_get_variables(ue_PyUObject self, PyObject * args)`
`50`	`50`	`PyObject *py_list = PyList_New(0);`
`51`	`51`	`for (FStructVariableDescription description : variables)`
`52`	`52`	`{`
`53`		`- PyList_Append(py_list, py_ue_new_uscriptstruct(FStructVariableDescription::StaticStruct(), (uint8*)&description));`
	`53`	`+ PyList_Append(py_list, py_ue_new_owned_uscriptstruct(FStructVariableDescription::StaticStruct(), (uint8*)&description));`
`54`	`54`	`}`
`55`	`55`	`return py_list;`
`56`	`56`	`}`