From 483b7a67b9322974075b64590907db32f749f226 Mon Sep 17 00:00:00 2001
From: Clement <clement.brisset@gmail.com>
Date: Tue, 12 Feb 2019 15:10:32 -0800
Subject: [PATCH] Fix simple traits vector bad init

---
 libraries/avatars/src/AssociatedTraitValues.h | 13 +++++++------
 libraries/avatars/src/AvatarTraits.h          | 14 +++++++++++++-
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/libraries/avatars/src/AssociatedTraitValues.h b/libraries/avatars/src/AssociatedTraitValues.h
index e3060a8097..0df8cd9bb5 100644
--- a/libraries/avatars/src/AssociatedTraitValues.h
+++ b/libraries/avatars/src/AssociatedTraitValues.h
@@ -28,9 +28,10 @@
 namespace AvatarTraits {
     template<typename T, T defaultValue>
     class AssociatedTraitValues {
+        using SimpleTypesArray = std::array<T, NUM_SIMPLE_TRAITS>;
     public:
         // constructor that pre-fills _simpleTypes with the default value specified by the template
-        AssociatedTraitValues() : _simpleTypes(FirstInstancedTrait, defaultValue) {}
+        AssociatedTraitValues() { std::fill(_simpleTypes.begin(), _simpleTypes.end(), defaultValue); }
 
         /// inserts the given value for the given simple trait type
         void insert(TraitType type, T value) { _simpleTypes[type] = value; }
@@ -71,12 +72,12 @@ namespace AvatarTraits {
         }
 
         /// const iterators for the vector of simple type values
-        typename std::vector<T>::const_iterator simpleCBegin() const { return _simpleTypes.cbegin(); }
-        typename std::vector<T>::const_iterator simpleCEnd() const { return _simpleTypes.cend(); }
+        typename SimpleTypesArray::const_iterator simpleCBegin() const { return _simpleTypes.cbegin(); }
+        typename SimpleTypesArray::const_iterator simpleCEnd() const { return _simpleTypes.cend(); }
 
         /// non-const iterators for the vector of simple type values
-        typename std::vector<T>::iterator simpleBegin() { return _simpleTypes.begin(); }
-        typename std::vector<T>::iterator simpleEnd() { return _simpleTypes.end(); }
+        typename SimpleTypesArray::iterator simpleBegin() { return _simpleTypes.begin(); }
+        typename SimpleTypesArray::iterator simpleEnd() { return _simpleTypes.end(); }
 
         struct TraitWithInstances {
             TraitType traitType;
@@ -96,7 +97,7 @@ namespace AvatarTraits {
         typename std::vector<TraitWithInstances>::iterator instancedEnd() { return _instancedTypes.end(); }
 
     private:
-        std::vector<T> _simpleTypes;
+        SimpleTypesArray _simpleTypes;
 
         /// return the iterator to the matching TraitWithInstances object for a given instanced trait type
         typename std::vector<TraitWithInstances>::iterator instancesForTrait(TraitType traitType) {
diff --git a/libraries/avatars/src/AvatarTraits.h b/libraries/avatars/src/AvatarTraits.h
index 4516572e42..5542acd37f 100644
--- a/libraries/avatars/src/AvatarTraits.h
+++ b/libraries/avatars/src/AvatarTraits.h
@@ -14,19 +14,31 @@
 
 #include <algorithm>
 #include <cstdint>
+#include <array>
 #include <vector>
 
 #include <QtCore/QUuid>
 
 namespace AvatarTraits {
     enum TraitType : int8_t {
+        // Null trait
         NullTrait = -1,
-        SkeletonModelURL,
+
+        // Simple traits
+        SkeletonModelURL = 0,
+
+
+        // Instanced traits
         FirstInstancedTrait,
         AvatarEntity = FirstInstancedTrait,
         Grab,
+
+        // Traits count
         TotalTraitTypes
     };
+    const int NUM_SIMPLE_TRAITS = (int)FirstInstancedTrait;
+    const int NUM_INSTANCED_TRAITS = (int)TotalTraitTypes - (int)FirstInstancedTrait;
+    const int NUM_TRAITS = (int)TotalTraitTypes;
 
     using TraitInstanceID = QUuid;