closed 20tab#575

Author: rdeioris

Source/UnrealEnginePython/Private/Slate/UEPySlate.cpp

@@ -417,6 +417,18 @@ void FPythonSlateDelegate::MenuPyAssetBuilder(FMenuBuilder &Builder, TArray<FAss
 }
 
 
+TSharedRef<FExtender> FPythonSlateDelegate::OnExtendContentBrowserMenu(const TArray<FAssetData>& SelectedAssets)
+{
+	TSharedRef<FExtender> Extender(new FExtender());
+
+	Extender->AddMenuExtension((char *)"GetAssetActions", EExtensionHook::After, nullptr, FMenuExtensionDelegate::CreateSP(this, &FPythonSlateDelegate::MenuPyAssetBuilder, SelectedAssets));
+
+	return Extender;
+}
+
+#endif
+
+
 void FPythonSlateDelegate::SubMenuPyBuilder(FMenuBuilder &Builder)
 {
 	FScopePythonGIL gil;
@@ -430,16 +442,6 @@ void FPythonSlateDelegate::SubMenuPyBuilder(FMenuBuilder &Builder)
 	Py_DECREF(ret);
 }
 
-TSharedRef<FExtender> FPythonSlateDelegate::OnExtendContentBrowserMenu(const TArray<FAssetData>& SelectedAssets)
-{
-	TSharedRef<FExtender> Extender(new FExtender());
-
-	Extender->AddMenuExtension((char *)"GetAssetActions", EExtensionHook::After, nullptr, FMenuExtensionDelegate::CreateSP(this, &FPythonSlateDelegate::MenuPyAssetBuilder, SelectedAssets));
-
-	return Extender;
-}
-
-#endif
 
 TSharedRef<SWidget> FPythonSlateDelegate::OnGenerateWidget(TSharedPtr<FPythonItem> py_item)
 {

Source/UnrealEnginePython/Private/Slate/UEPySlateDelegate.h

@@ -45,12 +45,12 @@ class FPythonSlateDelegate : public FPythonSmartDelegate
 	void OnAssetSelected(const FAssetData& AssetData);
 	TSharedRef<FExtender> OnExtendContentBrowserMenu(const TArray<FAssetData> &SelectedAssets);
 	void MenuPyAssetBuilder(FMenuBuilder &Builder, TArray<FAssetData> SelectedAssets);
-	void SubMenuPyBuilder(FMenuBuilder &Builder);
 	void OnAssetChanged(const FAssetData &AssetData);
 	bool OnShouldFilterAsset(const FAssetData& AssetData);
 #endif
 
 	void OnWindowClosed(const TSharedRef<SWindow> &Window);
+	void SubMenuPyBuilder(FMenuBuilder &Builder);
 
 	TSharedPtr<SWidget> OnContextMenuOpening();
 	TSharedRef<SWidget> OnGenerateWidget(TSharedPtr<FPythonItem> py_item);

Source/UnrealEnginePython/Private/UEPyModule.cpp

@@ -1697,9 +1697,9 @@ void unreal_engine_init_py_module()
 	ue_python_init_enumsimporter(new_unreal_engine_module);
 	ue_python_init_ustructsimporter(new_unreal_engine_module);
 
+#if WITH_EDITOR
 	ue_python_init_ffoliage_instance(new_unreal_engine_module);
 
-#if WITH_EDITOR
 	ue_python_init_fslowtask(new_unreal_engine_module);
 	ue_python_init_swidget(new_unreal_engine_module);
 	ue_python_init_farfilter(new_unreal_engine_module);

Source/UnrealEnginePython/Private/Wrappers/UEPyFFoliageInstance.cpp

@@ -6,6 +6,8 @@
 #include "Components/ActorComponent.h"
 #include "Runtime/Foliage/Public/InstancedFoliageActor.h"
 
+#if WITH_EDITOR
+
 #define get_instance(x) FFoliageInstance *instance = get_foliage_instance(x);\
 	if (!instance)\
 		return nullptr;
@@ -14,6 +16,8 @@
 	if (!instance)\
 		return -1;
 
+
+
 static FFoliageInstance* get_foliage_instance(ue_PyFFoliageInstance *self)
 {
 	if (!self->foliage_actor.IsValid())
@@ -45,6 +49,7 @@ static PyObject *ue_PyFFoliageInstance_str(ue_PyFFoliageInstance *self)
 		self->instance_id);
 }
 
+
 static PyObject *py_ue_ffoliage_instance_get_location(ue_PyFFoliageInstance *self, void *closure)
 {
 	get_instance(self);
@@ -257,4 +262,6 @@ PyObject *py_ue_new_ffoliage_instance(AInstancedFoliageActor *foliage_actor, UFo
 	ret->foliage_type = TWeakObjectPtr<UFoliageType>(foliage_type);
 	ret->instance_id = instance_id;
 	return (PyObject *)ret;
-}
+}
+
+#endif

Source/UnrealEnginePython/Private/Wrappers/UEPyFFoliageInstance.h

@@ -1,6 +1,7 @@
 #pragma once
 #include "UnrealEnginePython.h"
 
+#if WITH_EDITOR
 #include "InstancedFoliage.h"
 
 typedef struct 
@@ -14,3 +15,4 @@ typedef struct
 void ue_python_init_ffoliage_instance(PyObject *);
 
 PyObject *py_ue_new_ffoliage_instance(AInstancedFoliageActor *foliage_actor, UFoliageType *foliage_type, int32 instance_id);
+#endif