Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance

This commit is contained in:
Nissim Hadar 2017-12-26 11:35:59 -08:00
commit 7f5897e90b

View file

@ -126,7 +126,10 @@ void WebEntityRenderer::doRenderUpdateSynchronousTyped(const ScenePointer& scene
withWriteLock([&] {
// This work must be done on the main thread
if (!hasWebSurface()) {
buildWebSurface(entity);
// If we couldn't create a new web surface, exit
if (!buildWebSurface(entity)) {
return;
}
}
if (_contextPosition != entity->getWorldPosition()) {