Merge develop branch into master on top of upstream

Eugene Feinberg · sabhiram · commit 6fe11e116196 · 2018-04-06T14:54:25.000-07:00
Fix build for OSX10.9+

The UnrealEnginePython.Build.cs file would reference the python
framework path incorrectly.  This change adds three additional paths for
macos which should allow the plugin to compile.

[BugFix] Forgot to add framework paths for OSX

Add ue.py_exec1 and ue.py_exec2 to the plugin

This is so we can pass 1 and 2 args (respectively) to the invoked
python file / script.  This is done because this plugin (rather grossly)
uses python's execfile to run the entire included file.

Fix bug in draw_debug_line

Add project_world_location_to_screen

Remove double defn of mac paths

Add debug print to log relative scripts path (this is temporary)

Convert content directory to absolute path prior to usage.

Fix bugs with temporary strings going out of scope

1.  When you use the UE4 string macros to convert from TCHAR*s to
    UTF8 or ANSI, the storage for the destination strings will be
    allocated within the scope of the function call.  Once the var
    goes out of context, it will be destructed and its memory
    reclaimed.
2.  This was causing the case where the path specified to the RunFile()
    is relative to the scripts path and the `full_path` variable is
    assigned within the scope of an `if` block.

Implement N number of args for RunFileWithArgs()

Add ignore PCH rules to `*.Build.cs`

Fix string warnings causing build error if warnings are treated as errs

Fix more string warnings

Add missing TCHAR_TO_UTF8 macros

Fix include paths for 4.19 build

Fix for 4.19

Remove path component for 4.19

Wrap editor specific functions with WITH_EDITOR ifdef

Implement loading_assets call to check status of AssetRegistry
diff --git a/Source/UnrealEnginePython/Private/UEPyEditor.cpp b/Source/UnrealEnginePython/Private/UEPyEditor.cpp
@@ -521,6 +521,22 @@ PyObject *py_unreal_engine_create_modal_save_asset_dialog(PyObject * self, PyObj
 	return PyUnicode_FromString(TCHAR_TO_UTF8(*ret));
 }
 
+PyObject *py_unreal_engine_loading_assets(PyObject * self, PyObject * args)
+{
+  	if (!GEditor)
+		return PyErr_Format(PyExc_Exception, "no GEditor found");
+
+	FAssetRegistryModule& AssetRegistryModule = FModuleManager::GetModuleChecked<FAssetRegistryModule>("AssetRegistry");
+
+	if (AssetRegistryModule.Get().IsLoadingAssets()) {
+		Py_INCREF(Py_True);
+		return Py_True;	  
+	}
+	
+	Py_INCREF(Py_False);
+	return Py_False;	
+}
+
 PyObject *py_unreal_engine_get_asset(PyObject * self, PyObject * args)
 {
 	char *path;
diff --git a/Source/UnrealEnginePython/Private/UEPyEditor.h b/Source/UnrealEnginePython/Private/UEPyEditor.h
@@ -12,6 +12,7 @@ PyObject *py_unreal_engine_editor_get_selected_actors(PyObject *, PyObject *);
 PyObject *py_unreal_engine_editor_deselect_actors(PyObject *, PyObject *);
 PyObject *py_unreal_engine_editor_select_actor(PyObject *, PyObject *);
 PyObject *py_unreal_engine_import_asset(PyObject *, PyObject *);
+PyObject *py_unreal_engine_loading_assets(PyObject * self, PyObject * args);
 PyObject *py_unreal_engine_get_asset(PyObject *, PyObject *);
 PyObject *py_unreal_engine_find_asset(PyObject *, PyObject *);
 PyObject *py_unreal_engine_delete_object(PyObject *, PyObject *);
diff --git a/Source/UnrealEnginePython/Private/UEPyModule.cpp b/Source/UnrealEnginePython/Private/UEPyModule.cpp
@@ -270,6 +270,7 @@ static PyMethodDef unreal_engine_methods[] = {
 	{ "editor_deselect_actors", py_unreal_engine_editor_deselect_actors, METH_VARARGS, "" },
 	{ "import_asset", py_unreal_engine_import_asset, METH_VARARGS, "" },
 	{ "export_assets", py_unreal_engine_export_assets, METH_VARARGS, "" },
+	{ "loading_assets", py_unreal_engine_loading_assets, METH_VARARGS, ""},
 	{ "get_asset", py_unreal_engine_get_asset, METH_VARARGS, "" },
 	{ "find_asset", py_unreal_engine_find_asset, METH_VARARGS, "" },
 	{ "delete_object", py_unreal_engine_delete_object, METH_VARARGS, "" },
@@ -3213,4 +3214,4 @@ static PyObject *init_unreal_engine()
 
 	return new_unreal_engine_module;
 }
-#endif
+#endif
diff --git a/Source/UnrealEnginePython/Private/UObject/UEPySkeletal.cpp b/Source/UnrealEnginePython/Private/UObject/UEPySkeletal.cpp
@@ -8,6 +8,7 @@
 #endif
 #endif
 
+#if WITH_EDITOR
 
 PyObject *py_ue_get_anim_instance(ue_PyUObject *self, PyObject * args)
 {
@@ -1218,4 +1219,5 @@ PyObject *py_ue_skeletal_mesh_to_import_vertex_map(ue_PyUObject *self, PyObject
 
 	return py_list;
 }
+
 #endif
diff --git a/Source/UnrealEnginePython/Private/UnrealEnginePythonPrivatePCH.h b/Source/UnrealEnginePython/Private/UnrealEnginePythonPrivatePCH.h
@@ -47,9 +47,11 @@
 #include "Wrappers/UEPyFRandomStream.h"
 
 #include "Wrappers/UEPyFPythonOutputDevice.h"
+
 #if WITH_EDITOR
 #include "Wrappers/UEPyFSoftSkinVertex.h"
 #endif
+
 #include "Wrappers/UEPyFMorphTargetDelta.h"
 #include "Wrappers/UEPyFObjectThumbnail.h"
 
diff --git a/Source/UnrealEnginePython/Private/Wrappers/UEPyFMorphTargetDelta.cpp b/Source/UnrealEnginePython/Private/Wrappers/UEPyFMorphTargetDelta.cpp
@@ -1,5 +1,7 @@
 #include "UnrealEnginePythonPrivatePCH.h"
 
+#if WITH_EDITOR
+
 static PyObject *py_ue_fmorph_target_delta_get_position_delta(ue_PyFMorphTargetDelta *self, void *closure)
 {
 	return py_ue_new_fvector(self->morph_target_delta.PositionDelta);
@@ -137,4 +139,6 @@ PyObject *py_ue_new_fmorph_target_delta(FMorphTargetDelta morph_target_delta)
 	ue_PyFMorphTargetDelta *ret = (ue_PyFMorphTargetDelta *)PyObject_New(ue_PyFMorphTargetDelta, &ue_PyFMorphTargetDeltaType);
 	new(&ret->morph_target_delta) FMorphTargetDelta(morph_target_delta);
 	return (PyObject *)ret;
-}
+}
+
+#endif
diff --git a/Source/UnrealEnginePython/Private/Wrappers/UEPyFSoftSkinVertex.cpp b/Source/UnrealEnginePython/Private/Wrappers/UEPyFSoftSkinVertex.cpp
@@ -365,4 +365,4 @@ PyObject *py_ue_new_fsoft_skin_vertex(FSoftSkinVertex ss_vertex)
 	return (PyObject *)ret;
 }
 
-#endif
+#endif
diff --git a/Source/UnrealEnginePython/Private/Wrappers/UEPyFSoftSkinVertex.h b/Source/UnrealEnginePython/Private/Wrappers/UEPyFSoftSkinVertex.h
@@ -8,7 +8,7 @@
 #if ENGINE_MINOR_VERSION > 18
 
 #include "Runtime/Engine/Public/Rendering/SkeletalMeshLODModel.h"
-#include "Runtime/Engine/Public/Rendering/SkeletalMeshTypes.h"
+#include "Runtime/Engine/Public/SkeletalMeshTypes.h"
 
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`#endif`
`9`	`9`	`#endif`
`10`	`10`
	`11`	`+#if WITH_EDITOR`
`11`	`12`
`12`	`13`	`PyObject py_ue_get_anim_instance(ue_PyUObject self, PyObject * args)`
`13`	`14`	`{`
`@@ -1218,4 +1219,5 @@ PyObject py_ue_skeletal_mesh_to_import_vertex_map(ue_PyUObject self, PyObject`
`1218`	`1219`
`1219`	`1220`	`return py_list;`
`1220`	`1221`	`}`
	`1222`	`+`
`1221`	`1223`	`#endif`
Original file line number	Diff line number	Diff line change
`@@ -365,4 +365,4 @@ PyObject *py_ue_new_fsoft_skin_vertex(FSoftSkinVertex ss_vertex)`
`365`	`365`	`return (PyObject *)ret;`
`366`	`366`	`}`
`367`	`367`
`368`		`-#endif`
	`368`	`+#endif`