Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ 4802313

#rb
#rnx
#lockdown Laurent.Delayen

[CL 4803512 by Marc Audy in Dev-Anim branch]
This commit is contained in:
Marc Audy
2019-01-24 15:32:49 -05:00
parent 4f64d1a462
commit e5610adfd8
2721 changed files with 562707 additions and 11475 deletions

View File

@@ -60,7 +60,7 @@ public:
virtual bool CanCompile(const UBlueprint* Blueprint) override;
virtual void PreCompile(UBlueprint* Blueprint) override;
virtual void Compile(UBlueprint* Blueprint, const FKismetCompilerOptions& CompileOptions, FCompilerResultsLog& Results, TArray<UObject*>* ObjLoaded) override;
virtual void Compile(UBlueprint* Blueprint, const FKismetCompilerOptions& CompileOptions, FCompilerResultsLog& Results) override;
virtual void PostCompile(UBlueprint* Blueprint) override;
};
@@ -90,11 +90,11 @@ void FScriptEditorPlugin::PreCompile(UBlueprint* Blueprint)
}
void FScriptEditorPlugin::Compile(UBlueprint* Blueprint, const FKismetCompilerOptions& CompileOptions, FCompilerResultsLog& Results, TArray<UObject*>* ObjLoaded)
void FScriptEditorPlugin::Compile(UBlueprint* Blueprint, const FKismetCompilerOptions& CompileOptions, FCompilerResultsLog& Results)
{
if ( UScriptBlueprint* ScriptBlueprint = Cast<UScriptBlueprint>(Blueprint) )
{
FScriptBlueprintCompiler Compiler(ScriptBlueprint, Results, CompileOptions, ObjLoaded);
FScriptBlueprintCompiler Compiler(ScriptBlueprint, Results, CompileOptions);
Compiler.Compile();
check(Compiler.NewClass);
}