From 4e5b806934a188599aa43e0d606c7bae7260fc93 Mon Sep 17 00:00:00 2001
From: ericrius1 <ericrius1>
Date: Wed, 4 Nov 2015 16:05:29 -0800
Subject: [PATCH] particle effect entities no longer intersect with rays

---
 libraries/entities/src/EntityTreeElement.cpp      | 4 +++-
 libraries/entities/src/ParticleEffectEntityItem.h | 2 ++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/libraries/entities/src/EntityTreeElement.cpp b/libraries/entities/src/EntityTreeElement.cpp
index 57f49f2354..7ada138d02 100644
--- a/libraries/entities/src/EntityTreeElement.cpp
+++ b/libraries/entities/src/EntityTreeElement.cpp
@@ -18,6 +18,7 @@
 #include "EntityItemProperties.h"
 #include "EntityTree.h"
 #include "EntityTreeElement.h"
+#include "EntityTypes.h"
 
 EntityTreeElement::EntityTreeElement(unsigned char* octalCode) : OctreeElement() {
     init(octalCode);
@@ -591,7 +592,8 @@ bool EntityTreeElement::findDetailedRayIntersection(const glm::vec3& origin, con
                     }
                 } else {
                     // if the entity type doesn't support a detailed intersection, then just return the non-AABox results
-                    if (localDistance < distance) {
+                    // Never intersect with particle effect entities
+                    if (localDistance < distance && EntityTypes::getEntityTypeName(entity->getType()) != "ParticleEffect") {
                         distance = localDistance;
                         face = localFace;
                         surfaceNormal = localSurfaceNormal;
diff --git a/libraries/entities/src/ParticleEffectEntityItem.h b/libraries/entities/src/ParticleEffectEntityItem.h
index 6560a7bc33..e3c5cd895a 100644
--- a/libraries/entities/src/ParticleEffectEntityItem.h
+++ b/libraries/entities/src/ParticleEffectEntityItem.h
@@ -215,6 +215,8 @@ public:
         _additiveBlending = additiveBlending;
     }
 
+    virtual bool supportsDetailedRayIntersection() const { return false; }
+
 protected:
 
     bool isAnimatingSomething() const;