diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-07 02:06:14 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-07 02:06:14 +0400 |
| commit | 2314b77ebacc97e05495480bc1f66460b07001cc (patch) | |
| tree | be8b78cbeb5e4e6d3a16cbdd60f4cb7ff46731fb /intern | |
| parent | 32ba51c4a1a4c4a67eee3658b959f9569b7e6f56 (diff) | |
Fix float image loading crash in cycles after multithreading changes.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/render/image.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp index 3e6052338c0..856363491ca 100644 --- a/intern/cycles/render/image.cpp +++ b/intern/cycles/render/image.cpp @@ -344,7 +344,7 @@ void ImageManager::device_load_image(Device *device, DeviceScene *dscene, int sl } 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); device_vector<float4>& tex_img = dscene->tex_float_image[slot - TEX_IMAGE_FLOAT_START]; |