Merge remote-tracking branch 'origin/master' into 1.10
# Conflicts: # Source/Engine/Level/Prefabs/Prefab.Apply.cpp
This commit is contained in:
@@ -86,7 +86,7 @@ public:
|
||||
|
||||
void String(const StringAnsi& value)
|
||||
{
|
||||
String(value.Get(), static_cast<unsigned>(value.Length()));
|
||||
String(value.Get(), value.Length());
|
||||
}
|
||||
|
||||
FORCE_INLINE void RawValue(const StringAnsi& str)
|
||||
|
||||
Reference in New Issue
Block a user