From 0f91a283d401df68e45ff8c9e18d3c9f2fe79d84 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Tue, 26 Feb 2013 17:06:05 +0000 Subject: [PATCH] Fix #34421: cycles viewport render stuck with no objects in the scene. --- intern/cycles/render/object.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp index b31650c160a..17008b7a7f3 100644 --- a/intern/cycles/render/object.cpp +++ b/intern/cycles/render/object.cpp @@ -301,6 +301,8 @@ void ObjectManager::device_update(Device *device, DeviceScene *dscene, Scene *sc device_free(device, dscene); + need_update = false; + if(scene->objects.size() == 0) return; @@ -322,8 +324,6 @@ void ObjectManager::device_update(Device *device, DeviceScene *dscene, Scene *sc /* allocate object flag */ device->tex_alloc("__object_flag", dscene->object_flag); - - need_update = false; } void ObjectManager::device_free(Device *device, DeviceScene *dscene)