Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <eiseljulian@gmail.com>2016-08-09 05:32:38 +0300
committerJulian Eisel <eiseljulian@gmail.com>2016-08-09 05:32:38 +0300
commitb53eca171158ea395af11e82a1be0c5158180c79 (patch)
treea5d8b0f0afc4c6b6d31e75b5e85492dbc7ed0f4d
parent040fa75d7b9d796d2818d731934caf77e4288b7f (diff)
Cycles: Fix crash in empty scenes
To recreate, just delete default cube and render. Simple fix, but @maiself or @sergey may want to double-check ;)
-rw-r--r--intern/cycles/render/object.cpp3
1 files changed, 3 insertions, 0 deletions
diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp
index 28cc4fe58fa..62076f3a865 100644
--- a/intern/cycles/render/object.cpp
+++ b/intern/cycles/render/object.cpp
@@ -611,6 +611,9 @@ void ObjectManager::device_update_flags(Device *device,
void ObjectManager::device_update_patch_map_offsets(Device *device, DeviceScene *dscene, Scene *scene)
{
+ if (scene->objects.size() == 0)
+ return;
+
uint4* objects = (uint4*)dscene->objects.get_data();
bool update = false;