blender
/
blender
135
403
Fork 586
Code Issues 6.2k Pull Requests 757 Projects 19 Wiki Activity

Cycles: Fix crashes after recent image changes 

Not sure if this is a proper fix, but was getting frequent crashes, so
committing this real quick just to make master sable again. Can be
reverted later if there's a better fix. The changes to images really
need a closer look...
This commit is contained in:
Mai Lavelle 2017-04-28 18:47:47 -04:00
parent d6963630dc
commit 8f66d6826b
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
intern/cycles/render/image.cpp
View File

@ -888,26 +888,44 @@ void ImageManager::device_free_image(Device *device, DeviceScene *dscene, ImageD
device_memory *tex_img = NULL;
switch(type) {
case IMAGE_DATA_TYPE_FLOAT4:
if(slot >= dscene->tex_float4_image.size()) {
break;
}
tex_img = dscene->tex_float4_image[slot];
dscene->tex_float4_image[slot] = NULL;
break;
case IMAGE_DATA_TYPE_BYTE4:
if(slot >= dscene->tex_byte4_image.size()) {
break;
}
tex_img = dscene->tex_byte4_image[slot];
dscene->tex_byte4_image[slot]= NULL;
break;
case IMAGE_DATA_TYPE_HALF4:
if(slot >= dscene->tex_half4_image.size()) {
break;
}
tex_img = dscene->tex_half4_image[slot];
dscene->tex_half4_image[slot]= NULL;
break;
case IMAGE_DATA_TYPE_FLOAT:
if(slot >= dscene->tex_float_image.size()) {
break;
}
tex_img = dscene->tex_float_image[slot];
dscene->tex_float_image[slot] = NULL;
break;
case IMAGE_DATA_TYPE_BYTE:
if(slot >= dscene->tex_byte_image.size()) {
break;
}
tex_img = dscene->tex_byte_image[slot];
dscene->tex_byte_image[slot]= NULL;
break;
case IMAGE_DATA_TYPE_HALF:
if(slot >= dscene->tex_half_image.size()) {
break;
}
tex_img = dscene->tex_half_image[slot];
dscene->tex_half_image[slot]= NULL;
break;