Cleanup rejects from patching

trashguy · Oct 12, 2024 · 86af7d7 · 86af7d7
1 parent 7d72720
commit 86af7d7
Show file tree

Hide file tree

Showing 57 changed files with 42 additions and 712 deletions.
diff --git a/.git-blame-ignore-revs.rej b/.git-blame-ignore-revs.rej
diff --git a/.github/workflows/linux_builds.yml.rej b/.github/workflows/linux_builds.yml.rej
diff --git a/.github/workflows/macos_builds.yml.rej b/.github/workflows/macos_builds.yml.rej
diff --git a/.github/workflows/windows_builds.yml.rej b/.github/workflows/windows_builds.yml.rej
diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt
@@ -122,6 +122,7 @@ Files: ./servers/physics_3d/gjk_epa.cpp
  ./servers/physics_3d/shape_3d_sw.h
 Comment: Bullet Continuous Collision Detection and Physics Library
 Copyright: 2003-2008, Erwin Coumans
+ 2024-present, Redot Engine contributors
  2014-present, Godot Engine contributors
  2007-2014, Juan Linietsky, Ariel Manzur
 License: Expat and Zlib
@@ -130,6 +131,7 @@ Files: ./servers/physics_3d/joints/cone_twist_joint_3d_sw.cpp
  ./servers/physics_3d/joints/cone_twist_joint_3d_sw.h
 Comment: Bullet Continuous Collision Detection and Physics Library
 Copyright: 2007, Starbreeze Studios
+ 2024-present, Redot Engine contributors
  2014-present, Godot Engine contributors
  2007-2014, Juan Linietsky, Ariel Manzur
 License: Expat and Zlib

diff --git a/COPYRIGHT.txt.rej b/COPYRIGHT.txt.rej
diff --git a/SConstruct b/SConstruct
@@ -637,7 +637,7 @@ if methods.using_gcc(env):
     elif cc_version_major < 9:
         print_error(
             "Detected GCC version older than 9, which does not fully support "
-            "C++17, or has bugs when compiling Godot. Supported versions are 9 "
+            "C++17, or has bugs when compiling Redot. Supported versions are 9 "
             "and later. Use a newer GCC version, or Clang 6 or later by passing "
             '"use_llvm=yes" to the SCons command line.'
         )
@@ -774,7 +774,7 @@ else:
     # We apply it to CCFLAGS (both C and C++ code) in case it impacts C features.
     env.Prepend(CCFLAGS=["/std:c++17"])
 
-# Disable exception handling. Godot doesn't use exceptions anywhere, and this
+# Disable exception handling. Redot doesn't use exceptions anywhere, and this
 # saves around 20% of binary size and very significant build time (GH-80513).
 if env["disable_exceptions"]:
     if env.msvc:

diff --git a/SConstruct.rej b/SConstruct.rej
diff --git a/core/io/json.cpp.rej b/core/io/json.cpp.rej
diff --git a/core/math/transform_interpolator.cpp.rej b/core/math/transform_interpolator.cpp.rej
diff --git a/core/object/script_language.h.rej b/core/object/script_language.h.rej
diff --git a/doc/classes/Object.xml.rej b/doc/classes/Object.xml.rej
diff --git a/doc/classes/RenderingServer.xml b/doc/classes/RenderingServer.xml
@@ -5583,9 +5583,9 @@
 		<constant name="RENDERING_INFO_VIDEO_MEM_USED" value="5" enum="RenderingInfo">
 			Video memory used (in bytes). When using the Forward+ or mobile rendering backends, this is always greater than the sum of [constant RENDERING_INFO_TEXTURE_MEM_USED] and [constant RENDERING_INFO_BUFFER_MEM_USED], since there is miscellaneous data not accounted for by those two metrics. When using the GL Compatibility backend, this is equal to the sum of [constant RENDERING_INFO_TEXTURE_MEM_USED] and [constant RENDERING_INFO_BUFFER_MEM_USED].
 		</constant>
-		<constant name="FEATURE_SHADERS" value="0" enum="Features" deprecated="This constant has not been used since Godot 3.0.">
+		<constant name="FEATURE_SHADERS" value="0" enum="Features" deprecated="This constant has not been used since Redot 3.0.">
 		</constant>
-		<constant name="FEATURE_MULTITHREADED" value="1" enum="Features" deprecated="This constant has not been used since Godot 3.0.">
+		<constant name="FEATURE_MULTITHREADED" value="1" enum="Features" deprecated="This constant has not been used since Redot 3.0.">
 		</constant>
 	</constants>
 </class>
diff --git a/doc/classes/RenderingServer.xml.rej b/doc/classes/RenderingServer.xml.rej
diff --git a/drivers/gles3/rasterizer_gles3.cpp b/drivers/gles3/rasterizer_gles3.cpp
@@ -351,7 +351,7 @@ RasterizerGLES3::RasterizerGLES3() {
 		}
 	}
 
-	// Disable OpenGL linear to sRGB conversion, because Godot will always do this conversion itself.
+	// Disable OpenGL linear to sRGB conversion, because Redot will always do this conversion itself.
 	glDisable(GL_FRAMEBUFFER_SRGB);
 
 	// OpenGL needs to be initialized before initializing the Rasterizers

diff --git a/drivers/gles3/rasterizer_gles3.cpp.rej b/drivers/gles3/rasterizer_gles3.cpp.rej
diff --git a/editor/editor_about.cpp.rej b/editor/editor_about.cpp.rej
diff --git a/editor/editor_file_system.cpp.rej b/editor/editor_file_system.cpp.rej