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:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-09-03 20:52:59 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-09-03 20:52:59 +0400
commit989313e4500bd953c1558247a454a070515f4c6c (patch)
treec8162128e0f831678c2c0f862715d6389d1f8341 /intern/cycles/render/light.cpp
parent3e540d4d4c857b4a7b090c9b01c5467722458022 (diff)
Fix #32088: cycles crash removing a lamp with non-progressive sampling.
Diffstat (limited to 'intern/cycles/render/light.cpp')
-rw-r--r--intern/cycles/render/light.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/intern/cycles/render/light.cpp b/intern/cycles/render/light.cpp
index d00b242d153..6445c04257f 100644
--- a/intern/cycles/render/light.cpp
+++ b/intern/cycles/render/light.cpp
@@ -289,8 +289,14 @@ void LightManager::device_update_distribution(Device *device, DeviceScene *dscen
/* 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)