Integrating latest 47acbe8

Gems/Atom/RPI/Code/Source/RPI.Edit/Material/MaterialUtils.cpp

@@ -21,10 +21,6 @@
 #include <Atom/RPI.Edit/Common/JsonFileLoadContext.h>
 #include <AtomCore/Serialization/Json/JsonUtils.h>
 
-#include <AzCore/Math/Color.h>
-#include <AzCore/Math/Vector2.h>
-#include <AzCore/Math/Vector3.h>
-#include <AzCore/Math/Vector4.h>
 #include <AzCore/std/string/string.h>
 
 namespace AZ
@@ -67,40 +63,6 @@ namespace AZ
                 return true;
             }
 
-            template<typename T>
-            bool ComparePropertyValues(const AZStd::any& valueA, const AZStd::any& valueB)
-            {
-                return valueA.is<T>() && valueB.is<T>() && *AZStd::any_cast<T>(&valueA) == *AZStd::any_cast<T>(&valueB);
-            }
-
-            bool ArePropertyValuesEqual(const AZStd::any& valueA, const AZStd::any& valueB)
-            {
-                if (valueA.type() != valueB.type())
-                {
-                    return false;
-                }
-
-                if (ComparePropertyValues<bool>(valueA, valueB) ||
-                    ComparePropertyValues<int32_t>(valueA, valueB) ||
-                    ComparePropertyValues<uint32_t>(valueA, valueB) ||
-                    ComparePropertyValues<float>(valueA, valueB) ||
-                    ComparePropertyValues<AZ::Vector2>(valueA, valueB) ||
-                    ComparePropertyValues<AZ::Vector3>(valueA, valueB) ||
-                    ComparePropertyValues<AZ::Vector4>(valueA, valueB) ||
-                    ComparePropertyValues<AZ::Color>(valueA, valueB) ||
-                    ComparePropertyValues<AZ::Data::AssetId>(valueA, valueB) ||
-                    ComparePropertyValues<AZ::Data::Asset<AZ::RPI::ImageAsset>>(valueA, valueB) ||
-                    ComparePropertyValues<AZ::Data::Asset<AZ::RPI::StreamingImageAsset>>(valueA, valueB) ||
-                    ComparePropertyValues<AZ::Data::Asset<AZ::RPI::MaterialAsset>>(valueA, valueB) ||
-                    ComparePropertyValues<AZ::Data::Asset<AZ::RPI::MaterialTypeAsset>>(valueA, valueB) ||
-                    ComparePropertyValues<AZStd::string>(valueA, valueB))
-                {
-                    return true;
-                }
-
-                return false;
-            }
-
             AZ::Outcome<MaterialTypeSourceData> LoadMaterialTypeSourceData(const AZStd::string& filePath, const rapidjson::Value* document)
             {
                 AZ::Outcome<rapidjson::Document, AZStd::string> loadOutcome;