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

Merging //UE5/Release-Engine-Staging to Main (//UE5/Main) @ 14075166

Browse Source 
#rb
#rnx

[CL 14075271 by Marc Audy in ue5-main branch]
This commit is contained in:
Marc Audy
2020-08-11 01:36:57 -04:00
parent fa1f2339b5
commit a7c9001a94
5532 changed files with 991019 additions and 66660 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Engine/Source/Runtime/Datasmith/DatasmithCore/Private/DatasmithSceneElementsImpl.cpp
+1 -10
View File
@@ -5,7 +5,6 @@
#include "DatasmithUtils.h"
#include "DatasmithSceneFactory.h"
#include "IDatasmithSceneElements.h"
#include "Misc/PackageName.h"
bool IDatasmithShaderElement::bUseRealisticFresnel = true;
bool IDatasmithShaderElement::bDisableReflectionFresnel = false;
@@ -141,15 +140,7 @@ FDatasmithMaterialIDElementImpl::FDatasmithMaterialIDElementImpl(const TCHAR* In
: FDatasmithElementImpl( InName, EDatasmithElementType::MaterialId )
, Id( 0 )
{
// Allow asset path as name in order to allow reference to existing material
if (Name != InName)
{
FString Unsanitized = InName;
if (FPackageName::IsValidObjectPath(Unsanitized))
{
Name = Unsanitized;
}
}
FDatasmithMaterialIDElementImpl::SetName(InName); // no virtual call from ctr
}
FDatasmithHierarchicalInstancedStaticMeshActorElementImpl::FDatasmithHierarchicalInstancedStaticMeshActorElementImpl(const TCHAR* InName)
Engine/Source/Runtime/Datasmith/DatasmithCore/Private/DatasmithSceneElementsImpl.h
+6 -1
View File
@@ -9,6 +9,7 @@
#include "Containers/Array.h"
#include "Containers/UnrealString.h"
#include "Math/UnrealMathUtility.h"
#include "Misc/PackageName.h"
#include "Templates/SharedPointer.h"
template< typename InterfaceType >
@@ -299,7 +300,11 @@ class FDatasmithMaterialIDElementImpl : public FDatasmithElementImpl< IDatasmith
{
public:
explicit FDatasmithMaterialIDElementImpl(const TCHAR* InName);
virtual void SetName(const TCHAR* InName) override
{
FString Unsanitized = InName;
Name = FPackageName::IsValidObjectPath(Unsanitized) ? Unsanitized : FDatasmithUtils::SanitizeObjectName(Unsanitized);
}
virtual int32 GetId() const override { return Id; }
virtual void SetId(int32 InId) override { Id = InId; }