Merge remote-tracking branch 'origin/master' into 1.11

# Conflicts:
#	Source/Engine/Physics/Colliders/Collider.h
This commit is contained in:
Wojtek Figat
2025-10-11 00:16:10 +02:00
17 changed files with 105 additions and 31 deletions

View File

@@ -108,7 +108,6 @@ public:
}
bool String(const Ch* str, SizeType length, bool copy = false) {
RAPIDJSON_ASSERT(str != 0);
(void)copy;
PrettyPrefix(kStringType);
return Base::EndValue(Base::WriteString(str, length));