diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-02-26 21:06:05 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-02-26 21:06:05 +0400 |
| commit | 0f91a283d401df68e45ff8c9e18d3c9f2fe79d84 (patch) | |
| tree | 8c26b5ddd22e5cb4d2d0897bf3638c8a621642a6 /intern/cycles/render/object.cpp | |
| parent | 1c8377b0300a1173fa2a23e6a39e43fffc9424b0 (diff) | |
Fix #34421: cycles viewport render stuck with no objects in the scene.
Diffstat (limited to 'intern/cycles/render/object.cpp')
| -rw-r--r-- | intern/cycles/render/object.cpp | 4 |
1 files 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) |