Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 10:17:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8640 from sethalves/reenable-web-entities-on-linux

Browse source 
re-enable web entity-items on linux
This commit is contained in:
Chris Collins 2016-09-22 11:23:32 -07:00 committed by GitHub
commit a2f6dd859e
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -198,15 +198,10 @@ void RenderableWebEntityItem::render(RenderArgs* args) {
#endif #endif
if (!_webSurface) { if (!_webSurface) {
#if defined(Q_OS_LINUX)
// these don't seem to work on Linux
return;
#else
if (!buildWebSurface(static_cast<EntityTreeRenderer*>(args->_renderer))) { if (!buildWebSurface(static_cast<EntityTreeRenderer*>(args->_renderer))) {
return; return;
} }
_fadeStartTime = usecTimestampNow(); _fadeStartTime = usecTimestampNow();
#endif
} }
_lastRenderTime = usecTimestampNow(); _lastRenderTime = usecTimestampNow();