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>
monroegm-disable-blank-issue-2
santorac 4 years ago
parent 7d849cc0d2
commit aa85963a2b

@ -118,12 +118,16 @@ namespace AZ
else if (value.is<Data::Asset<Data::AssetData>>()) else if (value.is<Data::Asset<Data::AssetData>>())
{ {
result.m_value = Data::Asset<RPI::ImageAsset>( 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>>()) else if (value.is<Data::Asset<StreamingImageAsset>>())
{ {
result.m_value = Data::Asset<RPI::ImageAsset>( 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>>()) else if (value.is<Data::Asset<ImageAsset>>())
{ {

Loading…
Cancel
Save