From b14593202ce9ba551a99425dc8e0f7b1c0ed768b Mon Sep 17 00:00:00 2001 From: sabrina-shanman Date: Fri, 13 Sep 2019 14:23:15 -0700 Subject: [PATCH] Give hfm::Shape keys special undefined value --- libraries/hfm/src/hfm/HFM.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libraries/hfm/src/hfm/HFM.h b/libraries/hfm/src/hfm/HFM.h index e718a6d4ae..7a0516c04a 100644 --- a/libraries/hfm/src/hfm/HFM.h +++ b/libraries/hfm/src/hfm/HFM.h @@ -302,17 +302,19 @@ class DynamicTransform { std::vector deformers; std::vector clusters; // affect the deformer of the same index std::vector blendshapes; - // There is also the modelTransform, which for now is left in hfm::Mesh + // There are also the meshExtents and modelTransform, which for now are left in hfm::Mesh }; // The lightweight model part description. class Shape { public: - uint32_t mesh; - uint32_t meshPart; - uint32_t material; - uint32_t transform; // The static transform node when not taking into account rigging/skinning - uint32_t dynamicTransform; + const static uint32_t UNDEFINED_KEY { (uint32_t)-1 }; + + uint32_t mesh { UNDEFINED_KEY }; + uint32_t meshPart { UNDEFINED_KEY }; + uint32_t material { UNDEFINED_KEY }; + uint32_t transform { UNDEFINED_KEY }; // The static transform node when not taking into account rigging/skinning + uint32_t dynamicTransform { UNDEFINED_KEY }; }; /// The runtime model format.