sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Fix #34421: cycles viewport render stuck with no objects in the scene.

Browse Source
This commit is contained in:
Brecht Van Lommel 2013-02-26 17:06:05 +00:00
parent 1c8377b030
commit 0f91a283d4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/render/object.cpp
View File

@ -301,6 +301,8 @@ void ObjectManager::device_update(Device *device, DeviceScene *dscene, Scene *sc
device_free(device, dscene); device_free(device, dscene);
need_update = false;
if(scene->objects.size() == 0) if(scene->objects.size() == 0)
return; return;
@ -322,8 +324,6 @@ void ObjectManager::device_update(Device *device, DeviceScene *dscene, Scene *sc
/* allocate object flag */ /* allocate object flag */
device->tex_alloc("__object_flag", dscene->object_flag); device->tex_alloc("__object_flag", dscene->object_flag);
need_update = false;
} }
void ObjectManager::device_free(Device *device, DeviceScene *dscene) void ObjectManager::device_free(Device *device, DeviceScene *dscene)