From 6cbd40e6d84defc51f781bd4d9e24949cf6476dc Mon Sep 17 00:00:00 2001
From: Chandler Cox <mr.chandlercox@gmail.com>
Date: Tue, 22 Jul 2025 22:01:55 -0500
Subject: [PATCH 1/2] Make StringView::Empty const to fix issues with user
 accidentally changing the value.

---
 Source/Engine/Core/Types/StringView.cpp | 2 +-
 Source/Engine/Core/Types/StringView.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Engine/Core/Types/StringView.cpp b/Source/Engine/Core/Types/StringView.cpp
index 505d9ec05..168a537c1 100644
--- a/Source/Engine/Core/Types/StringView.cpp
+++ b/Source/Engine/Core/Types/StringView.cpp
@@ -9,7 +9,7 @@ StringView StringBuilder::ToStringView() const
     return StringView(_data.Get(), _data.Count());
 }
 
-StringView StringView::Empty;
+const StringView StringView::Empty;
 
 StringView::StringView(const String& str)
     : StringViewBase<Char>(str.Get(), str.Length())
diff --git a/Source/Engine/Core/Types/StringView.h b/Source/Engine/Core/Types/StringView.h
index 25d156c64..5dc0c14a1 100644
--- a/Source/Engine/Core/Types/StringView.h
+++ b/Source/Engine/Core/Types/StringView.h
@@ -219,7 +219,7 @@ public:
     /// <summary>
     /// Instance of the empty string.
     /// </summary>
-    static StringView Empty;
+    static const StringView Empty;
 
 public:
     /// <summary>

From d6a33d5a1c217c1eab88c7cbb8dcbcffa6145ee1 Mon Sep 17 00:00:00 2001
From: Chandler Cox <mr.chandlercox@gmail.com>
Date: Wed, 23 Jul 2025 10:23:30 -0500
Subject: [PATCH 2/2] Add const to String::Empty

---
 Source/Engine/Core/Types/String.cpp | 2 +-
 Source/Engine/Core/Types/String.h   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Engine/Core/Types/String.cpp b/Source/Engine/Core/Types/String.cpp
index 112434426..ff0e19eba 100644
--- a/Source/Engine/Core/Types/String.cpp
+++ b/Source/Engine/Core/Types/String.cpp
@@ -4,7 +4,7 @@
 #include "StringView.h"
 #include "Engine/Core/Collections/Array.h"
 
-String String::Empty;
+const String String::Empty;
 
 String::String(const StringAnsi& str)
 {
diff --git a/Source/Engine/Core/Types/String.h b/Source/Engine/Core/Types/String.h
index 4578ac0b3..0630ff6e3 100644
--- a/Source/Engine/Core/Types/String.h
+++ b/Source/Engine/Core/Types/String.h
@@ -548,7 +548,7 @@ public:
     /// <summary>
     /// Instance of the empty string.
     /// </summary>
-    static String Empty;
+    static const String Empty;
 
 public:
     /// <summary>