From 09bb61e4d81693b397982fc8e23c0b2194562a23 Mon Sep 17 00:00:00 2001 From: Zander Otavka Date: Fri, 7 Aug 2015 02:45:05 -0700 Subject: [PATCH] Add backwards compatibility for Image3DOverlays. Using "billboard" to create an Image3DOverlay is deprecated. Instead, use "image3d" or, even better, use overlayManager.js. --- interface/src/ui/overlays/Overlays.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/src/ui/overlays/Overlays.cpp b/interface/src/ui/overlays/Overlays.cpp index ab4270b615..cb235b37fb 100644 --- a/interface/src/ui/overlays/Overlays.cpp +++ b/interface/src/ui/overlays/Overlays.cpp @@ -138,6 +138,8 @@ unsigned int Overlays::addOverlay(const QString& type, const QScriptValue& prope if (type == ImageOverlay::TYPE) { thisOverlay = std::make_shared(); + } else if (type == Image3DOverlay::TYPE || type == "billboard") { // "billboard" for backwards compatibility + thisOverlay = std::make_shared(); } else if (type == TextOverlay::TYPE) { thisOverlay = std::make_shared(); } else if (type == Text3DOverlay::TYPE) { @@ -158,8 +160,6 @@ unsigned int Overlays::addOverlay(const QString& type, const QScriptValue& prope thisOverlay = std::make_shared(Application::getInstance()->getEntityClipboardRenderer()); } else if (type == ModelOverlay::TYPE) { thisOverlay = std::make_shared(); - } else if (type == Image3DOverlay::TYPE) { - thisOverlay = std::make_shared(); } if (thisOverlay) {