From 660bdf36d01b83996aacc93e9997eac41b70f463 Mon Sep 17 00:00:00 2001
From: sabrina-shanman <sabrina@highfidelity.io>
Date: Tue, 25 Sep 2018 09:56:11 -0700
Subject: [PATCH] Check if pick result is null when building visual pick result

---
 interface/src/raypick/LaserPointer.cpp    | 3 +++
 interface/src/raypick/ParabolaPointer.cpp | 3 +++
 interface/src/raypick/StylusPointer.cpp   | 3 +++
 3 files changed, 9 insertions(+)

diff --git a/interface/src/raypick/LaserPointer.cpp b/interface/src/raypick/LaserPointer.cpp
index 64faf5f9bf..79bca0449f 100644
--- a/interface/src/raypick/LaserPointer.cpp
+++ b/interface/src/raypick/LaserPointer.cpp
@@ -36,6 +36,9 @@ void LaserPointer::editRenderStatePath(const std::string& state, const QVariant&
 }
 
 PickResultPointer LaserPointer::getPickResultCopy(const PickResultPointer& pickResult) const {
+    if (!pickResult) {
+        std::make_shared<RayPickResult>();
+    }
     auto rayPickResult = std::static_pointer_cast<RayPickResult>(pickResult);
     return std::make_shared<RayPickResult>(*rayPickResult.get());
 }
diff --git a/interface/src/raypick/ParabolaPointer.cpp b/interface/src/raypick/ParabolaPointer.cpp
index 4614b81cbb..ec4222d5f6 100644
--- a/interface/src/raypick/ParabolaPointer.cpp
+++ b/interface/src/raypick/ParabolaPointer.cpp
@@ -31,6 +31,9 @@ ParabolaPointer::ParabolaPointer(const QVariant& rayProps, const RenderStateMap&
 }
 
 PickResultPointer ParabolaPointer::getPickResultCopy(const PickResultPointer& pickResult) const {
+    if (!pickResult) {
+        std::make_shared<ParabolaPickResult>();
+    }
     auto stylusPickResult = std::static_pointer_cast<ParabolaPickResult>(pickResult);
     return std::make_shared<ParabolaPickResult>(*stylusPickResult.get());
 }
diff --git a/interface/src/raypick/StylusPointer.cpp b/interface/src/raypick/StylusPointer.cpp
index 7f05a706a4..2742c68d1d 100644
--- a/interface/src/raypick/StylusPointer.cpp
+++ b/interface/src/raypick/StylusPointer.cpp
@@ -148,6 +148,9 @@ bool StylusPointer::shouldTrigger(const PickResultPointer& pickResult) {
 }
 
 PickResultPointer StylusPointer::getPickResultCopy(const PickResultPointer& pickResult) const {
+    if (!pickResult) {
+        std::make_shared<StylusPickResult>();
+    }
     auto stylusPickResult = std::static_pointer_cast<StylusPickResult>(pickResult);
     return std::make_shared<StylusPickResult>(*stylusPickResult.get());
 }