Allow classes to be assigned to Properties that are defined as taking a UObject

HughMacdonald · HughMacdonald · commit 7c7402d77f58 · 2018-04-29T15:19:28.000+01:00
diff --git a/Source/UnrealEnginePython/Private/UEPyModule.cpp b/Source/UnrealEnginePython/Private/UEPyModule.cpp
@@ -2437,6 +2437,14 @@ bool ue_py_convert_pyobject(PyObject *py_obj, UProperty *prop, uint8 *buffer, in
 				casted_prop_weak_object->SetPropertyValue_InContainer(buffer, FWeakObjectPtr(ue_obj->ue_object), index);
 				return true;
 			}
+			else if (auto casted_prop = Cast<UObjectPropertyBase>(prop))
+			{
+				// ensure the object type is correct, otherwise crash could happen (soon or later)
+				if (!ue_obj->ue_object->IsA(casted_prop->PropertyClass))
+					return false;
+				casted_prop->SetObjectPropertyValue_InContainer(buffer, ue_obj->ue_object, index);
+				return true;
+			}
 
 			return false;
 		}

Original file line number	Diff line number	Diff line change
`@@ -2437,6 +2437,14 @@ bool ue_py_convert_pyobject(PyObject py_obj, UProperty prop, uint8 *buffer, in`
`2437`	`2437`	`casted_prop_weak_object->SetPropertyValue_InContainer(buffer, FWeakObjectPtr(ue_obj->ue_object), index);`
`2438`	`2438`	`return true;`
`2439`	`2439`	`}`
	`2440`	`+ else if (auto casted_prop = Cast<UObjectPropertyBase>(prop))`
	`2441`	`+ {`
	`2442`	`+ // ensure the object type is correct, otherwise crash could happen (soon or later)`
	`2443`	`+ if (!ue_obj->ue_object->IsA(casted_prop->PropertyClass))`
	`2444`	`+ return false;`
	`2445`	`+ casted_prop->SetObjectPropertyValue_InContainer(buffer, ue_obj->ue_object, index);`
	`2446`	`+ return true;`
	`2447`	`+ }`
`2440`	`2448`
`2441`	`2449`	`return false;`
`2442`	`2450`	`}`