[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54885] trunk/blender/intern/cycles/render /object.cpp: Fix #34421: cycles viewport render stuck with no objects in the scene.

[Brecht Van Lommel]

Revision: 54885
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54885
Author:   blendix
Date:     2013-02-26 17:06:05 +0000 (Tue, 26 Feb 2013)
Log Message:
-----------
Fix #34421: cycles viewport render stuck with no objects in the scene.

Modified Paths:
--------------
    trunk/blender/intern/cycles/render/object.cpp

Modified: trunk/blender/intern/cycles/render/object.cpp
===================================================================
--- trunk/blender/intern/cycles/render/object.cpp	2013-02-26 16:39:41 UTC (rev 54884)
+++ trunk/blender/intern/cycles/render/object.cpp	2013-02-26 17:06:05 UTC (rev 54885)
@@ -301,6 +301,8 @@
 	
 	device_free(device, dscene);
 
+	need_update = false;
+
 	if(scene->objects.size() == 0)
 		return;
 
@@ -322,8 +324,6 @@
 
 	/* allocate object flag */
 	device->tex_alloc("__object_flag", dscene->object_flag);
-
-	need_update = false;
 }
 
 void ObjectManager::device_free(Device *device, DeviceScene *dscene)