izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rename StaticConstructObject to StaticConstructObject_Internal and use it only in CoreUObject module. Change rest of usages to NewObject.

Browse Source 
#codereview Robert.Manuszewski

[CL 2437731 by Mikolaj Sieluzycki in Main branch]
This commit is contained in:
Mikolaj Sieluzycki
2015-02-09 05:43:45 -05:00
parent 0a5a116446
commit 52c71176ab
64 changed files with 166 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Engine/Source/Editor/MaterialEditor/Private/MaterialEditor.cpp
View File

@@ -267,7 +267,7 @@ void FMaterialEditor::InitEditorForMaterialFunction(UMaterialFunction* InMateria
ExpressionPreviewMaterial = NULL;
// Create a temporary material to preview the material function
Material = (UMaterial*)StaticConstructObject(UMaterial::StaticClass());
Material = NewObject<UMaterial>();
{
FArchiveUObject DummyArchive;
// Hack: serialize the new material with an archive that does nothing so that its material resources are created
@@ -2739,7 +2739,7 @@ void FMaterialEditor::SetPreviewExpression(UMaterialExpression* NewPreviewExpres
if( ExpressionPreviewMaterial == NULL )
{
// Create the expression preview material if it hasnt already been created
ExpressionPreviewMaterial = (UMaterial*)StaticConstructObject( UMaterial::StaticClass(), GetTransientPackage(), NAME_None, RF_Public);
ExpressionPreviewMaterial = NewObject<UMaterial>(GetTransientPackage(), NAME_None, RF_Public);
ExpressionPreviewMaterial->bIsPreviewMaterial = true;
}