added FMaterialEditorUtilities

Author: Roberto De Ioris

Source/UnrealEnginePython/Private/MaterialEditorUtilities/UEPyFMaterialEditorUtilities.cpp

@@ -0,0 +1,88 @@
+
+#include "UnrealEnginePythonPrivatePCH.h"
+
+#if WITH_EDITOR
+
+#include "UEPyFMaterialEditorUtilities.h"
+
+
+
+
+static PyObject *py_ue_paste_nodes_here(PyObject *cls, PyObject * args)
+{
+	PyObject *py_graph;
+	float x;
+	float y;
+
+	if (!PyArg_ParseTuple(args, "O(ff):paste_nodes_here", &py_graph, &x, &y))
+		return nullptr;
+
+	UEdGraph *Graph = ue_py_check_type<UEdGraph>(py_graph);
+	if (!Graph)
+	{
+		return PyErr_Format(PyExc_Exception, "argument is not a UEdGraph");
+	}
+
+	FMaterialEditorUtilities::PasteNodesHere(Graph, FVector2D(x, y));
+	Py_RETURN_NONE;
+}
+
+
+static PyMethodDef ue_PyFMaterialEditorUtilities_methods[] = {
+	{ "paste_nodes_here", (PyCFunction)py_ue_paste_nodes_here, METH_VARARGS | METH_CLASS, "" },
+	{ NULL }  /* Sentinel */
+};
+
+
+static PyTypeObject ue_PyFMaterialEditorUtilitiesType = {
+	PyVarObject_HEAD_INIT(NULL, 0)
+	"unreal_engine.FMaterialEditorUtilities", /* tp_name */
+	sizeof(ue_PyFMaterialEditorUtilities), /* tp_basicsize */
+	0,                         /* tp_itemsize */
+	0,       /* tp_dealloc */
+	0,                         /* tp_print */
+	0,                         /* tp_getattr */
+	0,                         /* tp_setattr */
+	0,                         /* tp_reserved */
+	0,                         /* tp_repr */
+	0,                         /* tp_as_number */
+	0,                         /* tp_as_sequence */
+	0,                         /* tp_as_mapping */
+	0,                         /* tp_hash  */
+	0,                         /* tp_call */
+	0,                         /* tp_str */
+	0,                         /* tp_getattro */
+	0,                         /* tp_setattro */
+	0,                         /* tp_as_buffer */
+	Py_TPFLAGS_DEFAULT,        /* tp_flags */
+	"Unreal Engine MaterialEditorUtilities",           /* tp_doc */
+	0,                         /* tp_traverse */
+	0,                         /* tp_clear */
+	0,                         /* tp_richcompare */
+	0,                         /* tp_weaklistoffset */
+	0,                         /* tp_iter */
+	0,                         /* tp_iternext */
+	ue_PyFMaterialEditorUtilities_methods,             /* tp_methods */
+	0,
+	0,
+};
+
+static int py_ue_fmaterial_editor_utilities_init(ue_PyFMaterialEditorUtilities *self, PyObject * args)
+{
+	PyErr_SetString(PyExc_Exception, "FMaterialEditorUtilities is a singleton");
+	return -1;
+}
+
+void ue_python_init_fmaterial_editor_utilities(PyObject *ue_module)
+{
+	ue_PyFMaterialEditorUtilitiesType.tp_new = PyType_GenericNew;
+	ue_PyFMaterialEditorUtilitiesType.tp_init = (initproc)py_ue_fmaterial_editor_utilities_init;
+
+	if (PyType_Ready(&ue_PyFMaterialEditorUtilitiesType) < 0)
+		return;
+
+	Py_INCREF(&ue_PyFMaterialEditorUtilitiesType);
+	PyModule_AddObject(ue_module, "FMaterialEditorUtilities", (PyObject *)&ue_PyFMaterialEditorUtilitiesType);
+}
+
+#endif

Source/UnrealEnginePython/Private/MaterialEditorUtilities/UEPyFMaterialEditorUtilities.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#include "UnrealEnginePython.h"
+
+#if WITH_EDITOR
+
+#include "Editor/MaterialEditor/Public/MaterialEditorUtilities.h"
+
+typedef struct
+{
+	PyObject_HEAD
+		/* Type-specific fields go here. */
+} ue_PyFMaterialEditorUtilities;
+
+void ue_python_init_fmaterial_editor_utilities(PyObject *);
+#endif

Source/UnrealEnginePython/Private/Slate/UEPyFModifierKeysState.cpp

@@ -116,7 +116,7 @@ static int ue_py_fmodifier_keys_state_init(ue_PyFModifierKeysState *self, PyObje
 
 void ue_python_init_fmodifier_keys_state(PyObject *ue_module)
 {
-
+	ue_PyFModifierKeysStateType.tp_new = PyType_GenericNew;
 	ue_PyFModifierKeysStateType.tp_init = (initproc)ue_py_fmodifier_keys_state_init;
 
 	if (PyType_Ready(&ue_PyFModifierKeysStateType) < 0)

Source/UnrealEnginePython/Private/UEPyModule.cpp

@@ -1947,6 +1947,7 @@ void unreal_engine_init_py_module()
 	ue_python_init_fslate_application(new_unreal_engine_module);
 
 #if WITH_EDITOR
+	ue_python_init_fmaterial_editor_utilities(new_unreal_engine_module);
 	ue_python_init_icollection_manager(new_unreal_engine_module);
 #endif
 

Source/UnrealEnginePython/Private/UObject/UEPyMaterial.cpp

@@ -455,16 +455,16 @@ PyObject *py_ue_get_material_graph(ue_PyUObject *self, PyObject * args)
 
 	ue_py_check(self);
 
-	if (!self->ue_object->IsA<UMaterial>())
-	{
+	UMaterial *material = ue_py_check_type<UMaterial>(self);
+	if (!material)
 		return PyErr_Format(PyExc_Exception, "uobject is not a UMaterialInterface");
-	}
-
-	UMaterial *material = (UMaterial *)self->ue_object;
 
 	UMaterialGraph *graph = material->MaterialGraph;
 	if (!graph)
-		material->MaterialGraph = (UMaterialGraph *)FBlueprintEditorUtils::CreateNewGraph(material, NAME_None, UMaterialGraph::StaticClass(), UMaterialGraphSchema::StaticClass());
+	{
+		graph = (UMaterialGraph *)FBlueprintEditorUtils::CreateNewGraph(material, NAME_None, UMaterialGraph::StaticClass(), UMaterialGraphSchema::StaticClass());
+		material->MaterialGraph = graph;
+	}
 	if (!graph)
 		return PyErr_Format(PyExc_Exception, "Unable to retrieve/allocate MaterialGraph");
 

Source/UnrealEnginePython/Private/UnrealEnginePythonPrivatePCH.h

@@ -72,6 +72,7 @@
 #include "Blueprint/UEPyEdGraphPin.h"
 #include "UEPyIPlugin.h"
 #include "CollectionManager/UEPyICollectionManager.h"
+#include "MaterialEditorUtilities/UEPyFMaterialEditorUtilities.h"
 #endif
 
 #include "Slate/UEPySlate.h"

Source/UnrealEnginePython/UnrealEnginePython.Build.cs

@@ -166,7 +166,8 @@ public UnrealEnginePython(TargetInfo Target)
                 "FBX",
                 "Persona",
                 "PropertyEditor",
-                "LandscapeEditor"
+                "LandscapeEditor",
+                "MaterialEditor"
             });
         }