improved material scripting

Author: Roberto De Ioris

Source/UnrealEnginePython/Private/UEPyEngine.cpp

@@ -346,7 +346,7 @@ PyObject *py_unreal_engine_new_object(PyObject * self, PyObject * args) {
 
 	FName f_name = NAME_None;
 
-	if (name) {
+	if (name && strlen(name) > 0) {
 		f_name = FName(UTF8_TO_TCHAR(name));
 	}
 

Source/UnrealEnginePython/Private/UEPyMaterial.cpp

@@ -1,6 +1,11 @@
 
 
 #include "UnrealEnginePythonPrivatePCH.h"
+#if WITH_EDITOR
+#include "Editor/UnrealEd/Classes/MaterialGraph/MaterialGraph.h"
+#include "Editor/UnrealEd/Public/Kismet2/BlueprintEditorUtils.h"
+#include "Editor/UnrealEd/Classes/MaterialGraph/MaterialGraphSchema.h"
+#endif
 
 PyObject *py_ue_set_material_scalar_parameter(ue_PyUObject *self, PyObject * args) {
 
@@ -422,13 +427,19 @@ PyObject *py_ue_get_material_graph(ue_PyUObject *self, PyObject * args) {
 
 	ue_py_check(self);
 
-	if (!self->ue_object->IsA<UMaterialInterface>()) {
+	if (!self->ue_object->IsA<UMaterial>()) {
 		return PyErr_Format(PyExc_Exception, "uobject is not a UMaterialInterface");
 	}
 
-	UMaterialInterface *material_interface = (UMaterialInterface *)self->ue_object;
+	UMaterial *material = (UMaterial *)self->ue_object;
+
+	UMaterialGraph *graph = material->MaterialGraph;
+	if (!graph)
+		material->MaterialGraph = (UMaterialGraph *)FBlueprintEditorUtils::CreateNewGraph(material, NAME_None, UMaterialGraph::StaticClass(), UMaterialGraphSchema::StaticClass());
+	if (!graph)
+		return PyErr_Format(PyExc_Exception, "Unable to retrieve/allocate MaterialGraph");
 
-	ue_PyUObject *ret = ue_get_python_wrapper((UObject *)material_interface->GetMaterial()->MaterialGraph);
+	ue_PyUObject *ret = ue_get_python_wrapper(graph);
 	if (!ret)
 		return PyErr_Format(PyExc_Exception, "PyUObject is in invalid state");
 	Py_INCREF(ret);

Source/UnrealEnginePython/Private/UEPyModule.cpp

@@ -341,6 +341,7 @@ static PyMethodDef ue_PyUObject_methods[] = {
 	{ "get_py_proxy", (PyCFunction)py_ue_get_py_proxy, METH_VARARGS, "" },
 
 	{ "post_edit_change", (PyCFunction)py_ue_post_edit_change, METH_VARARGS, "" },
+	{ "pre_edit_change", (PyCFunction)py_ue_pre_edit_change, METH_VARARGS, "" },
 
 #if WITH_EDITOR
 	{ "save_config", (PyCFunction)py_ue_save_config, METH_VARARGS, "" },

Source/UnrealEnginePython/Private/UEPyObject.cpp

@@ -141,6 +141,19 @@ PyObject *py_ue_post_edit_change(ue_PyUObject *self, PyObject * args) {
 	return Py_None;
 }
 
+PyObject *py_ue_pre_edit_change(ue_PyUObject *self, PyObject * args) {
+	ue_py_check(self);
+
+	if (!self->ue_object) {
+		return PyErr_Format(PyExc_Exception, "uobject is not valid");
+	}
+#if WITH_EDITOR
+	self->ue_object->PreEditChange(nullptr);
+#endif
+	Py_INCREF(Py_None);
+	return Py_None;
+}
+
 
 #if WITH_EDITOR
 PyObject *py_ue_set_metadata(ue_PyUObject * self, PyObject * args) {

Source/UnrealEnginePython/Private/UEPyObject.h

@@ -48,6 +48,7 @@ PyObject *py_ue_functions(ue_PyUObject *, PyObject *);
 PyObject *py_ue_broadcast(ue_PyUObject *, PyObject *);
 
 PyObject *py_ue_post_edit_change( ue_PyUObject *, PyObject * );
+PyObject *py_ue_pre_edit_change(ue_PyUObject *, PyObject *);
 
 
 #if WITH_EDITOR