From cbef6e546f3d3d1adac1d560986b1ce1f1c9e03a Mon Sep 17 00:00:00 2001 From: Atlante45 Date: Thu, 19 Mar 2015 17:25:53 +0100 Subject: [PATCH] Fix emun placement --- libraries/entities/src/EntityItemProperties.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libraries/entities/src/EntityItemProperties.h b/libraries/entities/src/EntityItemProperties.h index 28c48c889b..40a9760e5c 100644 --- a/libraries/entities/src/EntityItemProperties.h +++ b/libraries/entities/src/EntityItemProperties.h @@ -93,8 +93,11 @@ enum EntityPropertyList { PROP_LOCAL_GRAVITY, PROP_PARTICLE_RADIUS, + // used by Model entities + PROP_ATTRIBUTION, + // NOTE: add new properties ABOVE this line and then modify PROP_LAST_ITEM below - PROP_LAST_ITEM = PROP_PARTICLE_RADIUS, + PROP_LAST_ITEM = PROP_ATTRIBUTION, // 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 @@ -103,9 +106,6 @@ enum EntityPropertyList { PROP_LINE_HEIGHT = PROP_ANIMATION_URL, PROP_BACKGROUND_COLOR = PROP_ANIMATION_FPS, PROP_COLLISION_MODEL_URL, - - // used by Model entities - PROP_ATTRIBUTION }; typedef PropertyFlags EntityPropertyFlags;