From 8542de8c3291458b11bebc158e273d067d442504 Mon Sep 17 00:00:00 2001 From: santorac <55155825+santorac@users.noreply.github.com> Date: Mon, 2 Aug 2021 12:02:58 -0700 Subject: [PATCH] Fixed a link error on android (clang) --- .../Code/Include/Atom/RPI.Reflect/Model/ModelMaterialSlot.h | 2 +- .../RPI/Code/Source/RPI.Reflect/Model/ModelMaterialSlot.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/ModelMaterialSlot.h b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/ModelMaterialSlot.h index 27137459b7..dd46aca6cd 100644 --- a/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/ModelMaterialSlot.h +++ b/Gems/Atom/RPI/Code/Include/Atom/RPI.Reflect/Model/ModelMaterialSlot.h @@ -26,7 +26,7 @@ namespace AZ static void Reflect(AZ::ReflectContext* context); using StableId = uint32_t; - static const StableId InvalidStableId = -1; + static const StableId InvalidStableId; //! This ID must have a consistent value when the asset is reprocessed by the asset pipeline, and must be unique within the ModelLodAsset. //! In practice, this set using the MaterialUid from SceneAPI. See ModelAssetBuilderComponent::CreateMesh. diff --git a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelMaterialSlot.cpp b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelMaterialSlot.cpp index 61f3ebbe3a..0900949625 100644 --- a/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelMaterialSlot.cpp +++ b/Gems/Atom/RPI/Code/Source/RPI.Reflect/Model/ModelMaterialSlot.cpp @@ -13,6 +13,10 @@ namespace AZ { namespace RPI { + // Normally this would be defined in the header file and substituted by the compiler, but for + // some reason clang doesn't accept it. + const ModelMaterialSlot::StableId ModelMaterialSlot::InvalidStableId = -1; + void ModelMaterialSlot::Reflect(AZ::ReflectContext* context) { if (auto* serializeContext = azrtti_cast(context))