Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-09 22:42:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #13717 from highfidelity/revert-13577-invisibleWebEntities

Browse source 
Revert "Allow empty web entities to be rendered"
This commit is contained in:
Seth Alves 2018-07-30 15:24:17 -07:00 committed by GitHub
commit 1b47d3f274
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libraries/entities-renderer/src/RenderableWebEntityItem.cpp
View file

@ -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();