[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [50359] trunk/blender/intern/cycles/render /light.cpp: Fix #32088: cycles crash removing a lamp with non-progressive sampling.

[Brecht Van Lommel]

Revision: 50359
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=50359
Author:   blendix
Date:     2012-09-03 16:52:59 +0000 (Mon, 03 Sep 2012)
Log Message:
-----------
Fix #32088: cycles crash removing a lamp with non-progressive sampling.

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

Modified: trunk/blender/intern/cycles/render/light.cpp
===================================================================
--- trunk/blender/intern/cycles/render/light.cpp	2012-09-03 16:08:28 UTC (rev 50358)
+++ trunk/blender/intern/cycles/render/light.cpp	2012-09-03 16:52:59 UTC (rev 50359)
@@ -289,8 +289,14 @@
 		/* CDF */
 		device->tex_alloc("__light_distribution", dscene->light_distribution);
 	}
-	else
+	else {
 		dscene->light_distribution.clear();
+
+		kintegrator->num_distribution = 0;
+		kintegrator->num_all_lights = 0;
+		kintegrator->pdf_triangles = 0.0f;
+		kintegrator->pdf_lights = 0.0f;
+	}
 }
 
 void LightManager::device_update_background(Device *device, DeviceScene *dscene, Scene *scene, Progress& progress)