implemented get_asset() editor function

Roberto De Ioris · Roberto De Ioris · commit bfe17534cd1e · 2016-08-29T19:24:31.000+02:00
diff --git a/Source/PythonConsole/Private/SPythonLog.cpp b/Source/PythonConsole/Private/SPythonLog.cpp
@@ -241,7 +241,7 @@ void SPythonConsoleInputBox::OnTextCommitted(const FText& InText, ETextCommit::T
 						OnConsoleCommandExecuted.ExecuteIfBound();
 						return;
 					}
-						
+
 					if (PyList_Check(ret)) {
 						for (int i = 0; i < PyList_Size(ret); i++) {
 							PyObject *item = PyList_GetItem(ret, i);
diff --git a/Source/UnrealEnginePython/Private/UEPyEditor.cpp b/Source/UnrealEnginePython/Private/UEPyEditor.cpp
@@ -4,6 +4,7 @@
 
 #include "Developer/AssetTools/Public/AssetToolsModule.h"
 #include "Editor/UnrealEd/Classes/Factories/Factory.h"
+#include "Runtime/AssetRegistry/Public/AssetRegistryModule.h"
 
 
 PyObject *py_unreal_engine_get_editor_world(PyObject * self, PyObject * args) {
@@ -180,5 +181,26 @@ PyObject *py_unreal_engine_message_dialog_open(PyObject * self, PyObject * args)
 
 	return PyLong_FromLong(ret);
 }
+
+PyObject *py_unreal_engine_get_asset(PyObject * self, PyObject * args) {
+	char *path;
+
+	if (!PyArg_ParseTuple(args, "s|get_asset", &path)) {
+		return NULL;
+	}
+
+	if (!GEditor)
+		return PyErr_Format(PyExc_Exception, "no GEditor found");
+
+	FAssetRegistryModule& AssetRegistryModule = FModuleManager::GetModuleChecked<FAssetRegistryModule>("AssetRegistry");
+	FAssetData asset = AssetRegistryModule.Get().GetAssetByObjectPath(UTF8_TO_TCHAR(path));
+	if (!asset.IsValid())
+		return PyErr_Format(PyExc_Exception, "unable to find asset %s", path);
+	ue_PyUObject *ret = ue_get_python_wrapper(asset.GetAsset());
+	if (!ret)
+		return PyErr_Format(PyExc_Exception, "PyUObject is in invalid state");
+	Py_INCREF(ret);
+	return (PyObject *)ret;
+}
 #endif
 
diff --git a/Source/UnrealEnginePython/Private/UEPyModule.cpp b/Source/UnrealEnginePython/Private/UEPyModule.cpp
@@ -80,6 +80,7 @@ static PyMethodDef unreal_engine_methods[] = {
 	{ "editor_select_actor", py_unreal_engine_editor_select_actor, METH_VARARGS, "" },
 	{ "editor_deselect_actors", py_unreal_engine_editor_deselect_actors, METH_VARARGS, "" },
 	{ "import_asset", py_unreal_engine_import_asset, METH_VARARGS, "" },
+	{ "get_asset", py_unreal_engine_get_asset, METH_VARARGS, "" },
 #endif
 
 	{ "new_object", py_unreal_engine_new_object, METH_VARARGS, "" },

Original file line number	Diff line number	Diff line change
`@@ -241,7 +241,7 @@ void SPythonConsoleInputBox::OnTextCommitted(const FText& InText, ETextCommit::T`
`241`	`241`	`OnConsoleCommandExecuted.ExecuteIfBound();`
`242`	`242`	`return;`
`243`	`243`	`}`
`244`		`-`
	`244`	`+`
`245`	`245`	`if (PyList_Check(ret)) {`
`246`	`246`	`for (int i = 0; i < PyList_Size(ret); i++) {`
`247`	`247`	`PyObject *item = PyList_GetItem(ret, i);`