[Bf-blender-cvs] [d6b7745] master: Fix T47447: Cycles crash when reaching texture limit with 3D textures

[Sergey Sharybin]

Commit: d6b77450ce185339de5f16f3bdf4596e0ce57230
Author: Sergey Sharybin
Date:   Wed Feb 17 11:43:03 2016 +0100
Branches: master
https://developer.blender.org/rBd6b77450ce185339de5f16f3bdf4596e0ce57230

Fix T47447: Cycles crash when reaching texture limit with 3D textures

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

M	intern/cycles/render/attribute.cpp

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

diff --git a/intern/cycles/render/attribute.cpp b/intern/cycles/render/attribute.cpp
index 6e94459..b7de83d 100644
--- a/intern/cycles/render/attribute.cpp
+++ b/intern/cycles/render/attribute.cpp
@@ -32,8 +32,9 @@ Attribute::~Attribute()
 	if(element == ATTR_ELEMENT_VOXEL) {
 		VoxelAttribute *voxel_data = data_voxel();
 
-		if(voxel_data)
+		if(voxel_data && voxel_data->slot != -1) {
 			voxel_data->manager->remove_image(voxel_data->slot);
+		}
 	}
 }