From a6aaa71d02be9c4d7313fd9a35db29ab83d27e24 Mon Sep 17 00:00:00 2001 From: Seth Alves Date: Mon, 30 Jul 2018 11:54:52 -0700 Subject: [PATCH] Revert "Allow empty web entities to be rendered" --- .../entities-renderer/src/RenderableWebEntityItem.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp index 004a965c28..793b4aa158 100644 --- a/libraries/entities-renderer/src/RenderableWebEntityItem.cpp +++ b/libraries/entities-renderer/src/RenderableWebEntityItem.cpp @@ -178,6 +178,10 @@ void WebEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& scene withWriteLock([&] { + if (_contentType == ContentType::NoContent) { + return; + } + // This work must be done on the main thread // If we couldn't create a new web surface, exit if (!hasWebSurface() && !buildWebSurface(entity)) { @@ -311,13 +315,7 @@ bool WebEntityRenderer::buildWebSurface(const TypedEntityPointer& entity) { }); } else if (_contentType == ContentType::QmlContent) { _webSurface->load(_lastSourceUrl); - } else if (_contentType == ContentType::NoContent) { - // Show empty white panel - _webSurface->load("controls/WebEntityView.qml", [this](QQmlContext* context, QObject* item) { - item->setProperty(URL_PROPERTY, ""); - }); } - _fadeStartTime = usecTimestampNow(); _webSurface->resume();