Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix float image loading crash in cycles after multithreading changes.

Browse Source
This commit is contained in:
Brecht Van Lommel
2012-05-06 22:06:14 +00:00
parent 32ba51c4a1
commit 2314b77eba
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -344,7 +344,7 @@ void ImageManager::device_load_image(Device *device, DeviceScene *dscene, int sl
} }
if(is_float) { if(is_float) {
string filename = path_filename(float_images[slot]->filename); string filename = path_filename(float_images[slot - TEX_IMAGE_FLOAT_START]->filename);
progress->set_status("Updating Images", "Loading " + filename); progress->set_status("Updating Images", "Loading " + filename);
device_vector<float4>& tex_img = dscene->tex_float_image[slot - TEX_IMAGE_FLOAT_START]; device_vector<float4>& tex_img = dscene->tex_float_image[slot - TEX_IMAGE_FLOAT_START];