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:
authorSergey Sharybin <sergey.vfx@gmail.com>2016-02-17 13:43:03 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2016-02-17 13:43:03 +0300
commitd6b77450ce185339de5f16f3bdf4596e0ce57230 (patch)
tree5c5d7585e287e9af877f8a096250b5157c56d820 /intern/cycles/render/attribute.cpp
parent4431caae1a9dc5fae4c2e832478571fe7a77840a (diff)
Fix T47447: Cycles crash when reaching texture limit with 3D textures
Diffstat (limited to 'intern/cycles/render/attribute.cpp')
-rw-r--r--intern/cycles/render/attribute.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/intern/cycles/render/attribute.cpp b/intern/cycles/render/attribute.cpp
index 6e94459da55..b7de83d89c1 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);
+ }
}
}