Merge commit 'cb19b3859f52330ccae02cc04990ec14d686d19d' into bebylon

ikrima · ikrima · commit 5f36fd647815 · 2018-05-29T21:53:06.000-07:00
diff --git a/Source/UnrealEnginePython/Private/UEPyEditor.cpp b/Source/UnrealEnginePython/Private/UEPyEditor.cpp
@@ -1531,46 +1531,58 @@ PyObject *py_unreal_engine_blueprint_add_member_variable(PyObject * self, PyObje
 
 	PyObject *py_blueprint;
 	char *name;
-	char *in_type;
+	PyObject *py_type;
 	PyObject *py_is_array = nullptr;
-	if (!PyArg_ParseTuple(args, "Oss|O:blueprint_add_member_variable", &py_blueprint, &name, &in_type, &py_is_array))
+	char *default_value = nullptr;
+	if (!PyArg_ParseTuple(args, "OsO|Os:blueprint_add_member_variable", &py_blueprint, &name, &py_type, &py_is_array, &default_value))
 	{
-		return NULL;
+		return nullptr;
 	}
 
-	if (!ue_is_pyuobject(py_blueprint))
-	{
-		return PyErr_Format(PyExc_Exception, "argument is not a UObject");
-	}
+	UBlueprint *bp = ue_py_check_type<UBlueprint>(py_blueprint);
+	if (!bp)
+		return PyErr_Format(PyExc_Exception, "uobject is not a Blueprint");
 
-	ue_PyUObject *py_obj = (ue_PyUObject *)py_blueprint;
-	if (!py_obj->ue_object->IsA<UBlueprint>())
-		return PyErr_Format(PyExc_Exception, "uobject is not a UBlueprint");
-	UBlueprint *bp = (UBlueprint *)py_obj->ue_object;
+	FEdGraphPinType pin;
 
-	bool is_array = false;
-	if (py_is_array && PyObject_IsTrue(py_is_array))
-		is_array = true;
+	if (PyUnicode_Check(py_type))
+	{
+		char *in_type = PyUnicode_AsUTF8(py_type);
+
+		bool is_array = false;
+		if (py_is_array && PyObject_IsTrue(py_is_array))
+			is_array = true;
 #if ENGINE_MINOR_VERSION > 14
-	FEdGraphPinType pin;
-	pin.PinCategory = UTF8_TO_TCHAR(in_type);
+		pin.PinCategory = UTF8_TO_TCHAR(in_type);
 #if ENGINE_MINOR_VERSION >= 17
-	pin.ContainerType = is_array ? EPinContainerType::Array : EPinContainerType::None;
+		pin.ContainerType = is_array ? EPinContainerType::Array : EPinContainerType::None;
 #else
-	pin.bIsArray = is_array;
+		pin.bIsArray = is_array;
 #endif
 #else
-	FEdGraphPinType pin(UTF8_TO_TCHAR(in_type), FString(""), nullptr, is_array, false);
+		FEdGraphPinType pin2(UTF8_TO_TCHAR(in_type), FString(""), nullptr, is_array, false);
+		pin = pin2;
 #endif
+	}
+	else
+	{
+		FEdGraphPinType *pinptr = ue_py_check_struct<FEdGraphPinType>(py_type);
+		if (!pinptr)
+			return PyErr_Format(PyExc_Exception, "argument is not a EdGraphPinType");
+		pin = *pinptr;
+	}
+
+	FString DefaultValue = FString("");
 
-	if (FBlueprintEditorUtils::AddMemberVariable(bp, UTF8_TO_TCHAR(name), pin))
+	if (default_value)
+		DefaultValue = FString(default_value);
+
+	if (FBlueprintEditorUtils::AddMemberVariable(bp, UTF8_TO_TCHAR(name), pin, DefaultValue))
 	{
-		Py_INCREF(Py_True);
-		return Py_True;
+		Py_RETURN_TRUE;
 	}
 
-	Py_INCREF(Py_False);
-	return Py_False;
+	Py_RETURN_FALSE;
 }
 
 PyObject *py_unreal_engine_blueprint_set_variable_visibility(PyObject * self, PyObject * args)
diff --git a/Source/UnrealEnginePython/Private/UEPyModule.cpp b/Source/UnrealEnginePython/Private/UEPyModule.cpp
@@ -2520,6 +2520,11 @@ bool ue_py_convert_pyobject(PyObject *py_obj, UProperty *prop, uint8 *buffer, in
 				casted_prop_soft_object->SetPropertyValue_InContainer(buffer, FSoftObjectPtr(ue_obj->ue_object), index);
 				return true;
 			}
+			else if (auto casted_prop_weak_object = Cast<UWeakObjectProperty>(prop))
+			{
+				casted_prop_weak_object->SetPropertyValue_InContainer(buffer, FWeakObjectPtr(ue_obj->ue_object), index);
+				return true;
+			}
 
 			return false;
 		}
diff --git a/examples/blueprint_variables.py b/examples/blueprint_variables.py
@@ -0,0 +1,28 @@
+import unreal_engine as ue
+
+from unreal_engine.classes import Material, BlueprintFactory, Blueprint, Actor, Texture2D, SkeletalMesh
+from unreal_engine.structs import EdGraphPinType, Vector, Rotator, EdGraphTerminalType
+from unreal_engine.enums import EPinContainerType
+
+import time
+
+bp = ue.create_blueprint(Actor, '/Game/FooActor' + str(int(time.time())))
+
+pin = EdGraphPinType(PinCategory='object', PinSubCategoryObject=Material)
+ue.blueprint_add_member_variable(bp, 'TestMat', pin, None, '/Engine/MapTemplates/Materials/BasicAsset03.BasicAsset03')
+
+pin = EdGraphPinType(PinCategory='class', PinSubCategoryObject=Texture2D)
+ue.blueprint_add_member_variable(bp, 'TestTextureClass', pin)
+
+pin = EdGraphPinType(PinCategory='struct',PinSubCategoryObject=Vector)
+ue.blueprint_add_member_variable(bp, 'TestVector', pin, None, '17,22,30')
+
+pin = EdGraphPinType(PinCategory='struct',PinSubCategoryObject=Rotator,ContainerType=EPinContainerType.Array)
+ue.blueprint_add_member_variable(bp, 'TestRotator', pin, None, '((Pitch=0.000000,Yaw=3.000000,Roll=0.000000),(Pitch=1.000000,Yaw=0.000000,Roll=0.000000))')
+
+pin = EdGraphPinType(PinCategory='string',ContainerType=EPinContainerType.Map,PinValueType=EdGraphTerminalType(TerminalCategory='object',TerminalSubCategoryObject=SkeletalMesh))
+ue.blueprint_add_member_variable(bp, 'TestMap', pin, None, '(("firstKey", SkeletalMesh\'"/Game/Skel001"\'),("secondKey", SkeletalMesh\'"/Game/Skel002"\'))')
+
+ue.compile_blueprint(bp)
+
+ue.open_editor_for_asset(bp)

Original file line number	Diff line number	Diff line change
`@@ -2520,6 +2520,11 @@ bool ue_py_convert_pyobject(PyObject py_obj, UProperty prop, uint8 *buffer, in`
`2520`	`2520`	`casted_prop_soft_object->SetPropertyValue_InContainer(buffer, FSoftObjectPtr(ue_obj->ue_object), index);`
`2521`	`2521`	`return true;`
`2522`	`2522`	`}`
	`2523`	`+ else if (auto casted_prop_weak_object = Cast<UWeakObjectProperty>(prop))`
	`2524`	`+ {`
	`2525`	`+ casted_prop_weak_object->SetPropertyValue_InContainer(buffer, FWeakObjectPtr(ue_obj->ue_object), index);`
	`2526`	`+ return true;`
	`2527`	`+ }`
`2523`	`2528`
`2524`	`2529`	`return false;`
`2525`	`2530`	`}`