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 1/2] 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) {

From 645508de042037f15dbd25212e08649db1340038 Mon Sep 17 00:00:00 2001
From: SamGondelman <samuel_gondelman@alumni.brown.edu>
Date: Thu, 6 Dec 2018 09:59:24 -0800
Subject: [PATCH 2/2] add jsdocs for BillboardMode

---
 libraries/shared/src/BillboardMode.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/libraries/shared/src/BillboardMode.h b/libraries/shared/src/BillboardMode.h
index 7f3e79d453..050f939941 100644
--- a/libraries/shared/src/BillboardMode.h
+++ b/libraries/shared/src/BillboardMode.h
@@ -11,6 +11,21 @@
 
 #include "QString"
 
+/**jsdoc
+ * <p>How an entity is billboarded.</p>
+ * <table>
+ *   <thead>
+ *     <tr><th>Value</th><th>Description</th></tr>
+ *   </thead>
+ *   <tbody>
+ *     <tr><td><code>none</code></td><td>The entity will not be billboarded.</td></tr>
+ *     <tr><td><code>yaw</code></td><td>The entity will yaw, but not pitch, to face the camera.  Its actual rotation will be ignored.</td></tr>
+ *     <tr><td><code>full</code></td><td>The entity will be billboarded to face the camera.  Its actual rotation will be ignored.</td></tr>
+ *   </tbody>
+ * </table>
+ * @typedef {string} BillboardMode
+ */
+
 enum class BillboardMode {
     NONE = 0,
     YAW,