From bd1817817bd87930cf24a76f5707bb7def0d12df Mon Sep 17 00:00:00 2001 From: Andrew Meadows Date: Wed, 11 Feb 2015 12:59:59 -0800 Subject: [PATCH] restore order of PROP_USER_DATA --- libraries/entities/src/EntityItemProperties.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h index fe814c61f0..bb6fd8094d 100644 --- a/libraries/entities/src/EntityItemProperties.h +++ b/libraries/entities/src/EntityItemProperties.h @@ -81,12 +81,11 @@ enum EntityPropertyList { // used by Model entities PROP_TEXTURES, PROP_ANIMATION_SETTINGS, + PROP_USER_DATA, PROP_SHAPE_TYPE, - // NOTE: add new properties ABOVE this line - - PROP_USER_DATA, - PROP_LAST_ITEM = PROP_USER_DATA, + // NOTE: add new properties ABOVE this line and then modify PROP_LAST_ITEM below + PROP_LAST_ITEM = PROP_SHAPE_TYPE // These properties of TextEntity piggy back off of properties of ModelEntities, the type doesn't matter // since the derived class knows how to interpret it's own properties and knows the types it expects