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

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

View file

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