Merge branch '3.7' into 3.8-beta

This commit is contained in:
badlogic 2019-04-08 18:04:27 +02:00
commit 262f2d8aa6
3 changed files with 3 additions and 3 deletions

View File

@ -37,7 +37,7 @@ class FSpineEditorPlugin: public ISpineEditorPlugin {
virtual void ShutdownModule() override; virtual void ShutdownModule() override;
}; };
IMPLEMENT_MODULE(FSpineEditorPlugin, ISpineEditorPlugin) IMPLEMENT_MODULE(FSpineEditorPlugin, SpineEditorPlugin)
void FSpineEditorPlugin::StartupModule () { void FSpineEditorPlugin::StartupModule () {
} }

View File

@ -15,7 +15,7 @@ namespace UnrealBuildTool.Rules
PrivateIncludePaths.Add(Path.Combine(ModuleDirectory, "Private")); PrivateIncludePaths.Add(Path.Combine(ModuleDirectory, "Private"));
PrivateIncludePaths.Add(Path.Combine(ModuleDirectory, "Public/spine-cpp/include")); PrivateIncludePaths.Add(Path.Combine(ModuleDirectory, "Public/spine-cpp/include"));
PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "RHI", "RenderCore", "ShaderCore", "ProceduralMeshComponent", "UMG", "Slate", "SlateCore" }); PublicDependencyModuleNames.AddRange(new string[] { "Core", "CoreUObject", "Engine", "ProceduralMeshComponent", "UMG", "Slate", "SlateCore" });
PublicDefinitions.Add("SPINE_UE4"); PublicDefinitions.Add("SPINE_UE4");
} }
} }

View File

@ -1,6 +1,6 @@
{ {
"FileVersion": 3, "FileVersion": 3,
"EngineAssociation": "4.21", "EngineAssociation": "4.22",
"Category": "", "Category": "",
"Description": "", "Description": "",
"Modules": [ "Modules": [