From abef5c4d6178b3e2ed7fa61c99df3c60ae6748d2 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Wed, 5 Dec 2018 15:05:01 -0800
Subject: [PATCH] fix grab billboarding bug

---
 libraries/entities/src/EntityItemProperties.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/entities/src/EntityItemProperties.cpp b/libraries/entities/src/EntityItemProperties.cpp
index 6f451f937a..7af70b4da0 100644
--- a/libraries/entities/src/EntityItemProperties.cpp
+++ b/libraries/entities/src/EntityItemProperties.cpp
@@ -1843,7 +1843,7 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
     // Handle conversions from old 'textures' property to "imageURL"
     {
         QScriptValue V = object.property("textures");
-        if (V.isValid()) {
+        if (_type == EntityTypes::Image && V.isValid() && !object.property("imageURL").isValid()) {
             bool isValid = false;
             QString textures = QString_convertFromScriptValue(V, isValid);
             if (isValid) {
@@ -1862,7 +1862,7 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
     // Handle old "faceCamera" and "isFacingAvatar" props
     {
         QScriptValue P = object.property("faceCamera");
-        if (P.isValid()) {
+        if (P.isValid() && !object.property("billboardMode").isValid()) {
             bool newValue = P.toVariant().toBool();
             bool oldValue = getBillboardMode() == BillboardMode::YAW;
             if (_defaultSettings || newValue != oldValue) {
@@ -1872,7 +1872,7 @@ void EntityItemProperties::copyFromScriptValue(const QScriptValue& object, bool
     }
     {
         QScriptValue P = object.property("isFacingAvatar");
-        if (P.isValid()) {
+        if (P.isValid() && !object.property("billboardMode").isValid() && !object.property("faceCamera").isValid()) {
             bool newValue = P.toVariant().toBool();
             bool oldValue = getBillboardMode() == BillboardMode::FULL;
             if (_defaultSettings || newValue != oldValue) {