Merging //UE4/Dev-Main to Dev-Geometry (from CL: 3492074)

#rb none

[CL 3493369 by Mike Fricker in Dev-Geometry branch]
This commit is contained in:
Mike Fricker
2017-06-15 17:45:03 -04:00
parent cb60c57c48
commit fddcdcac09
5884 changed files with 213547 additions and 184356 deletions

View File

@@ -50,7 +50,7 @@ struct FGeneratedCodeData
ClassName = GeneratedClassName.ToString();
IBlueprintCompilerCppBackendModule& CodeGenBackend = (IBlueprintCompilerCppBackendModule&)IBlueprintCompilerCppBackendModule::Get();
BaseFilename = CodeGenBackend.ConstructBaseFilename(&InBlueprint);
BaseFilename = CodeGenBackend.ConstructBaseFilename(&InBlueprint, FCompilerNativizationOptions{});
GatherUserDefinedDependencies(InBlueprint);
}
@@ -159,7 +159,7 @@ struct FGeneratedCodeData
FBlueprintNativeCodeGenUtils::GenerateCppCode(Obj, HeaderSource, CppSource, NativizationSummary, FCompilerNativizationOptions{});
SlowTask.EnterProgressFrame();
const FString BackendBaseFilename = CodeGenBackend.ConstructBaseFilename(Obj);
const FString BackendBaseFilename = CodeGenBackend.ConstructBaseFilename(Obj, FCompilerNativizationOptions{});
const FString FullHeaderFilename = FPaths::Combine(*HeaderDirPath, *(BackendBaseFilename + TEXT(".h")));
const bool bHeaderSaved = FFileHelper::SaveStringToFile(*HeaderSource, *FullHeaderFilename);