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

# Conflicts: # Source/Engine/Graphics/Materials/MaterialShader.h
2025-02-18 09:19:59 +01:00
parent d501018feb c81ddd09cc
commit a6fb651ff4
133 changed files with 2253 additions and 654 deletions
--- a/Source/Engine/Serialization/JsonTools.cpp
+++ b/Source/Engine/Serialization/JsonTools.cpp
@@ -41,7 +41,7 @@ void ChangeIds(rapidjson_flax::Value& obj, rapidjson_flax::Document& document, c
                '0','0','0','0','0','0','0','0','0','0',
                '0','0','0','0','0','0','0','0','0','0',
                '0','0'
-                // @formatter:on
+            // @formatter:on
            };
            static const char* digits = "0123456789abcdef";
            uint32 n = value.A;