From ec146069b14e97e86f80de360935bb6d483f5d82 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Fri, 18 Sep 2015 13:06:18 -0700
Subject: [PATCH] Reuse old property enum slots

---
 libraries/entities/src/EntityPropertyFlags.h        | 8 +++-----
 libraries/entities/src/ParticleEffectEntityItem.cpp | 6 ++++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libraries/entities/src/EntityPropertyFlags.h b/libraries/entities/src/EntityPropertyFlags.h
index b3e20110c4..2298e41bde 100644
--- a/libraries/entities/src/EntityPropertyFlags.h
+++ b/libraries/entities/src/EntityPropertyFlags.h
@@ -96,7 +96,7 @@ enum EntityPropertyList {
     PROP_MAX_PARTICLES,
     PROP_LIFESPAN,
     PROP_EMIT_RATE,
-    PROP_EMIT_VELOCITY,
+    PROP_EMIT_SPEED,
     PROP_EMIT_STRENGTH,
     PROP_EMIT_ACCELERATION,
     PROP_PARTICLE_RADIUS,
@@ -136,7 +136,7 @@ enum EntityPropertyList {
     PROP_STROKE_WIDTHS,
 
     // used by particles
-    PROP_VELOCITY_SPREAD,
+    PROP_SPEED_SPREAD,
     PROP_ACCELERATION_SPREAD,
 
     PROP_X_N_NEIGHBOR_ID, // used by PolyVox
@@ -160,8 +160,6 @@ enum EntityPropertyList {
     PROP_ALPHA_SPREAD,
     PROP_ALPHA_START,
     PROP_ALPHA_FINISH,
-    PROP_EMIT_SPEED,
-    PROP_SPEED_SPREAD,
     PROP_EMIT_ORIENTATION,
     PROP_EMIT_DIMENSIONS,
     PROP_EMIT_RADIUS_START,
@@ -202,7 +200,7 @@ enum EntityPropertyList {
     PROP_ATMOSPHERE_CENTER = PROP_MAX_PARTICLES,
     PROP_ATMOSPHERE_INNER_RADIUS = PROP_LIFESPAN,
     PROP_ATMOSPHERE_OUTER_RADIUS = PROP_EMIT_RATE,
-    PROP_ATMOSPHERE_MIE_SCATTERING = PROP_EMIT_VELOCITY,
+    PROP_ATMOSPHERE_MIE_SCATTERING = PROP_EMIT_SPEED,
     PROP_ATMOSPHERE_RAYLEIGH_SCATTERING = PROP_EMIT_STRENGTH,
     PROP_ATMOSPHERE_SCATTERING_WAVELENGTHS = PROP_EMIT_ACCELERATION,
     PROP_ATMOSPHERE_HAS_STARS = PROP_PARTICLE_RADIUS,
diff --git a/libraries/entities/src/ParticleEffectEntityItem.cpp b/libraries/entities/src/ParticleEffectEntityItem.cpp
index 46b8e844dd..eb769dff3b 100644
--- a/libraries/entities/src/ParticleEffectEntityItem.cpp
+++ b/libraries/entities/src/ParticleEffectEntityItem.cpp
@@ -289,7 +289,8 @@ int ParticleEffectEntityItem::readEntitySubclassDataFromBuffer(const unsigned ch
     READ_ENTITY_PROPERTY(PROP_LIFESPAN, float, setLifespan);
     READ_ENTITY_PROPERTY(PROP_EMIT_RATE, float, setEmitRate);
     if (args.bitstreamVersion < VERSION_ENTITIES_PARTICLE_ELLIPSOID_EMITTER) {
-        SKIP_ENTITY_PROPERTY(PROP_EMIT_VELOCITY, glm::vec3);
+        // OLD PROP_EMIT_VELOCITY FAKEOUT
+        SKIP_ENTITY_PROPERTY(PROP_EMIT_SPEED, glm::vec3);
     }
     
     if (args.bitstreamVersion >= VERSION_ENTITIES_PARTICLE_MODIFICATIONS) {
@@ -298,7 +299,8 @@ int ParticleEffectEntityItem::readEntitySubclassDataFromBuffer(const unsigned ch
         READ_ENTITY_PROPERTY(PROP_PARTICLE_RADIUS, float, setParticleRadius);
         READ_ENTITY_PROPERTY(PROP_TEXTURES, QString, setTextures);
         if (args.bitstreamVersion < VERSION_ENTITIES_PARTICLE_ELLIPSOID_EMITTER) {
-            SKIP_ENTITY_PROPERTY(PROP_VELOCITY_SPREAD, glm::vec3);
+            // OLD PROP_VELOCITY_SPREAD FAKEOUT
+            SKIP_ENTITY_PROPERTY(PROP_SPEED_SPREAD, glm::vec3);
         }
     } else {
         // EMIT_ACCELERATION FAKEOUT