remove submodule, minor fixes

openpype/hosts/unreal/api/__init__.py

@@ -4,6 +4,26 @@ import logging
 from avalon import api as avalon
 from pyblish import api as pyblish
 import openpype.hosts.unreal
+from .plugin import(
+    Loader,
+    Creator
+)
+from .pipeline import (
+    install,
+    uninstall,
+    ls,
+    publish,
+    containerise,
+    show_creator,
+    show_loader,
+    show_publisher,
+    show_manager,
+    show_experimental_tools,
+    show_tools_dialog,
+    show_tools_popup,
+    instantiate,
+)
+
 
 logger = logging.getLogger("openpype.hosts.unreal")
 
@@ -15,6 +35,26 @@ CREATE_PATH = os.path.join(PLUGINS_DIR, "create")
 INVENTORY_PATH = os.path.join(PLUGINS_DIR, "inventory")
 
 
+__all__ = [
+    "install",
+    "uninstall",
+    "Creator",
+    "Loader",
+    "ls",
+    "publish",
+    "containerise",
+    "show_creator",
+    "show_loader",
+    "show_publisher",
+    "show_manager",
+    "show_experimental_tools",
+    "show_tools_dialog",
+    "show_tools_popup",
+    "instantiate"
+]
+
+
+
 def install():
     """Install Unreal configuration for OpenPype."""
     print("-=" * 40)

openpype/hosts/unreal/integration/Content/Python/init_unreal.py

@@ -4,12 +4,14 @@ openpype_detected = True
 try:
     from avalon import api
 except ImportError as exc:
+    api = None
     openpype_detected = False
     unreal.log_error("Avalon: cannot load Avalon [ {} ]".format(exc))
 
 try:
-    from openpype.host.unreal import api as openpype_host
+    from openpype.hosts.unreal import api as openpype_host
 except ImportError as exc:
+    openpype_host = None
     openpype_detected = False
     unreal.log_error("OpenPype: cannot load OpenPype [ {} ]".format(exc))
 

openpype/hosts/unreal/integration/Source/OpenPype/OpenPype.Build.cs

@@ -4,7 +4,7 @@ using UnrealBuildTool;
 
 public class OpenPype : ModuleRules
 {
-	public Avalon(ReadOnlyTargetRules Target) : base(Target)
+	public OpenPype(ReadOnlyTargetRules Target) : base(Target)
 	{
 		PCHUsage = ModuleRules.PCHUsageMode.UseExplicitOrSharedPCHs;
 		

openpype/hosts/unreal/integration/Source/OpenPype/Private/OpenPype.cpp

@@ -1,4 +1,4 @@
-#include "Avalon.h"
+#include "OpenPype.h"
 #include "LevelEditor.h"
 #include "OpenPypePythonBridge.h"
 #include "OpenPypeStyle.h"
@@ -75,7 +75,7 @@ void FOpenPypeModule::AddToobarEntry(FToolBarBuilder& ToolbarBuilder)
 	{
 		ToolbarBuilder.AddToolBarButton(
 			FUIAction(
-				FExecuteAction::CreateRaw(this, &FAvalonModule::MenuPopup),
+				FExecuteAction::CreateRaw(this, &FOpenPypeModule::MenuPopup),
 				NULL,
 				FIsActionChecked()
 

openpype/hosts/unreal/integration/Source/OpenPype/Private/OpenPypePythonBridge.cpp

@@ -3,11 +3,11 @@
 UOpenPypePythonBridge* UOpenPypePythonBridge::Get()
 {
 	TArray<UClass*> OpenPypePythonBridgeClasses;
-	GetDerivedClasses(UAvalonPythonBridge::StaticClass(), OpenPypePythonBridgeClasses);
+	GetDerivedClasses(UOpenPypePythonBridge::StaticClass(), OpenPypePythonBridgeClasses);
 	int32 NumClasses = OpenPypePythonBridgeClasses.Num();
 	if (NumClasses > 0)
 	{
-		return Cast<UOpenPypePythonBridge>(AvalonPythonBridgeClasses[NumClasses - 1]->GetDefaultObject());
+		return Cast<UOpenPypePythonBridge>(OpenPypePythonBridgeClasses[NumClasses - 1]->GetDefaultObject());
 	}
 	return nullptr;
 };

openpype/hosts/unreal/integration/Source/OpenPype/Public/AssetContainer.h

@@ -12,7 +12,7 @@
  * 
  */
 UCLASS(Blueprintable)
-class AVALON_API UAssetContainer : public UAssetUserData
+class OPENPYPE_API UAssetContainer : public UAssetUserData
 {
 	GENERATED_BODY()
 	

openpype/hosts/unreal/integration/Source/OpenPype/Public/OpenPypeLib.h

@@ -1,7 +1,7 @@
 #pragma once
 
 #include "Engine.h"
-#include "AvalonLib.generated.h"
+#include "OpenPypeLib.generated.h"
 
 
 UCLASS(Blueprintable)

openpype/hosts/unreal/integration/Source/OpenPype/Public/OpenPypeStyle.h

@@ -18,5 +18,5 @@ public:
 
 private:
 	static TUniquePtr< FSlateStyleSet > Create();
-	static TUniquePtr< FSlateStyleSet > AvalonStyleInstance;
+	static TUniquePtr< FSlateStyleSet > OpenPypeStyleInstance;
 };

repos/avalon-unreal-integration

@@ -1 +0,0 @@
-Subproject commit 43f6ea943980b29c02a170942b566ae11f2b7080