support for sync_to_browser when importing assets

Roberto De Ioris · Roberto De Ioris · commit e63d127224b1 · 2017-04-01T11:49:06.000+02:00
diff --git a/Source/PythonConsole/Public/PyFbxFactory.cpp b/Source/PythonConsole/Public/PyFbxFactory.cpp
@@ -11,7 +11,7 @@ UPyFbxFactory::UPyFbxFactory(const FObjectInitializer& ObjectInitializer)
 
 bool UPyFbxFactory::ConfigureProperties() {
 	bDetectImportTypeOnImport = true;
-	bShowOption = false;	
+	bShowOption = false;
 
 	return true;
 }
diff --git a/Source/PythonConsole/Public/PyFbxFactory.h b/Source/PythonConsole/Public/PyFbxFactory.h
@@ -6,7 +6,7 @@
 
 
 
-UCLASS(hidecategories=Object)
+UCLASS(hidecategories = Object)
 class UPyFbxFactory : public UFbxFactory
 {
 	GENERATED_BODY()
diff --git a/Source/UnrealEnginePython/Private/UEPyEditor.cpp b/Source/UnrealEnginePython/Private/UEPyEditor.cpp
@@ -199,7 +199,8 @@ PyObject *py_unreal_engine_import_asset(PyObject * self, PyObject * args) {
 	PyObject * assetsObject = nullptr;
 	char *destination;
 	PyObject *obj = nullptr;
-	if (!PyArg_ParseTuple(args, "Os|O:import_asset", &assetsObject, &destination, &obj)) {
+	PyObject *py_sync = nullptr;
+	if (!PyArg_ParseTuple(args, "Os|OO:import_asset", &assetsObject, &destination, &obj, &py_sync)) {
 		return NULL;
 	}
 
@@ -211,6 +212,7 @@ PyObject *py_unreal_engine_import_asset(PyObject * self, PyObject * args) {
 
 	UClass *factory_class = nullptr;
 	UFactory *factory = nullptr;
+	bool sync_to_browser = false;
 
 	if (!obj || obj == Py_None) {
 		factory_class = nullptr;
@@ -279,13 +281,17 @@ PyObject *py_unreal_engine_import_asset(PyObject * self, PyObject * args) {
 		char * filename = PyString_AsString(PyObject_Str(assetsObject));
 #endif
 		files.Add(UTF8_TO_TCHAR(filename));
-}
+	}
 	else {
 		return PyErr_Format(PyExc_Exception, "Not a string nor valid list of string");
 	}
 
+	if (py_sync && PyObject_IsTrue(py_sync)) {
+		sync_to_browser = true;
+	}
+
 	FAssetToolsModule& AssetToolsModule = FModuleManager::LoadModuleChecked<FAssetToolsModule>("AssetTools");
-	TArray<UObject *> objects = AssetToolsModule.Get().ImportAssets(files, UTF8_TO_TCHAR(destination), factory, false);
+	TArray<UObject *> objects = AssetToolsModule.Get().ImportAssets(files, UTF8_TO_TCHAR(destination), factory, sync_to_browser);
 
 	if (objects.Num() == 1) {
 

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ UPyFbxFactory::UPyFbxFactory(const FObjectInitializer& ObjectInitializer)`
`11`	`11`
`12`	`12`	`bool UPyFbxFactory::ConfigureProperties() {`
`13`	`13`	`bDetectImportTypeOnImport = true;`
`14`		`- bShowOption = false;`
	`14`	`+ bShowOption = false;`
`15`	`15`
`16`	`16`	`return true;`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`
`7`	`7`
`8`	`8`
`9`		`-UCLASS(hidecategories=Object)`
	`9`	`+UCLASS(hidecategories = Object)`
`10`	`10`	`class UPyFbxFactory : public UFbxFactory`
`11`	`11`	`{`
`12`	`12`	`GENERATED_BODY()`