Commit: 0e80eb82e0667aa9b64d5a5e3e34c84d1d9957a3 Author: Thomas Dinges Date: Thu May 14 01:11:43 2015 +0200 Branches: master https://developer.blender.org/rB0e80eb82e0667aa9b64d5a5e3e34c84d1d9957a3
Cycles: Resize light_data after possible light removal. =================================================================== M intern/cycles/render/light.cpp =================================================================== diff --git a/intern/cycles/render/light.cpp b/intern/cycles/render/light.cpp index 817e1f5..1b7aa0e 100644 --- a/intern/cycles/render/light.cpp +++ b/intern/cycles/render/light.cpp @@ -545,8 +545,6 @@ void LightManager::device_update_points(Device *device, DeviceScene *dscene, Sce if(scene->lights.size() == 0) return; - float4 *light_data = dscene->light_data.resize(scene->lights.size()*LIGHT_SIZE); - /* remove background light? */ if(!(device->info.advanced_shading)) { foreach(Light *light, scene->lights) { @@ -557,6 +555,7 @@ void LightManager::device_update_points(Device *device, DeviceScene *dscene, Sce } } + float4 *light_data = dscene->light_data.resize(scene->lights.size()*LIGHT_SIZE); int light_index = 0; foreach(Light *light, scene->lights) { _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs