[Bf-blender-cvs] [b53eca1] master: Cycles: Fix crash in empty scenes

Julian Eisel noreply at git.blender.org
Tue Aug 9 04:38:01 CEST 2016


Commit: b53eca171158ea395af11e82a1be0c5158180c79
Author: Julian Eisel
Date:   Tue Aug 9 04:32:38 2016 +0200
Branches: master
https://developer.blender.org/rBb53eca171158ea395af11e82a1be0c5158180c79

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 ;)

===================================================================

M	intern/cycles/render/object.cpp

===================================================================

diff --git a/intern/cycles/render/object.cpp b/intern/cycles/render/object.cpp
index 28cc4fe..62076f3 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;




More information about the Bf-blender-cvs mailing list