From 6f86b0f5507a2dab8e43e07d620a767f5a5ff832 Mon Sep 17 00:00:00 2001
From: ZappoMan <bradh@konamoxt.com>
Date: Sun, 4 Oct 2015 15:23:17 -0700
Subject: [PATCH] particle fixes

---
 examples/particles.js                               | 9 +++++----
 libraries/entities/src/ParticleEffectEntityItem.cpp | 3 +--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/examples/particles.js b/examples/particles.js
index adfed2cf11..a46baf2dea 100644
--- a/examples/particles.js
+++ b/examples/particles.js
@@ -11,7 +11,7 @@
                                            gravity: { x: 0, y: 0, z: 0 },
                                            visible: true,
                                            locked: false,
-                                           lifetime: 6000 });
+                                           lifetime: 6000});
         var self = this;
         this.timer = Script.setInterval(function () {
             var colorProp = { color: { red: Math.random() * 255,
@@ -36,7 +36,8 @@
                                            isEmitting: true,
                                            position: spawnPoint,
                                            dimensions: {x: 2, y: 2, z: 2},
-                                           emitSpeed: 5,
+                                           emitSpeed: 0.05,
+                                           maxParticles: 2,
                                            speedSpread: 2,
                                            polarFinish: 30 * DEG_TO_RAD,
                                            emitAcceleration: {x: 0, y: -9.8, z: 0},
@@ -52,8 +53,8 @@
         this.timer = Script.setInterval(function () {
             // flip is playing state
             self.isPlaying = !self.isPlaying;
-            var animProp = { animationIsPlaying: self.isPlaying };
-            Entities.editEntity(self.entity, animProp);
+            var emittingProp = { isEmitting: self.isPlaying };
+            Entities.editEntity(self.entity, emittingProp);
         }, (1 / blinkRate) * 1000);
     }
 
diff --git a/libraries/entities/src/ParticleEffectEntityItem.cpp b/libraries/entities/src/ParticleEffectEntityItem.cpp
index 421565fc84..ace0edb0e1 100644
--- a/libraries/entities/src/ParticleEffectEntityItem.cpp
+++ b/libraries/entities/src/ParticleEffectEntityItem.cpp
@@ -403,8 +403,7 @@ void ParticleEffectEntityItem::appendSubclassData(OctreePacketData* packetData,
 
 bool ParticleEffectEntityItem::isEmittingParticles() const {
     // keep emitting if there are particles still alive.
-    //return (getAnimationIsPlaying() || getLivingParticleCount() > 0) && getAnimationFPS() != 0.0f;
-    return (getLivingParticleCount() > 0);
+    return (getIsEmitting() || getLivingParticleCount() > 0);
 }
 
 bool ParticleEffectEntityItem::needsToCallUpdate() const {