Fixed MaterialPropertyValue::FromAny to preserve the Hint string when converting Asset objects. This fixed an issue where the hint didn't show up in the Material Component's instance inspector.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago · aa85963a2b
parent 7d849cc0d2
commit aa85963a2b
1 changed files with 6 additions and 2 deletions
--- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialPropertyValue.cpp
+++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Material/MaterialPropertyValue.cpp
@ -118,12 +118,16 @@ namespace AZ
            else if (value.is<Data::Asset<Data::AssetData>>())
            {
                result.m_value = Data::Asset<RPI::ImageAsset>(
-                    AZStd::any_cast<Data::Asset<Data::AssetData>>(value).GetId(), azrtti_typeid<RPI::StreamingImageAsset>());
+                    AZStd::any_cast<Data::Asset<Data::AssetData>>(value).GetId(),
+                    azrtti_typeid<RPI::StreamingImageAsset>(),
+                    AZStd::any_cast<Data::Asset<Data::AssetData>>(value).GetHint());
            }
            else if (value.is<Data::Asset<StreamingImageAsset>>())
            {
                result.m_value = Data::Asset<RPI::ImageAsset>(
-                    AZStd::any_cast<Data::Asset<StreamingImageAsset>>(value).GetId(), azrtti_typeid<RPI::StreamingImageAsset>());
+                    AZStd::any_cast<Data::Asset<StreamingImageAsset>>(value).GetId(),
+                    azrtti_typeid<RPI::StreamingImageAsset>(),
+                    AZStd::any_cast<Data::Asset<StreamingImageAsset>>(value).GetHint());
            }
            else if (value.is<Data::Asset<ImageAsset>>())
            {