[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46366] trunk/blender/intern/cycles/render /image.cpp: Fix float image loading crash in cycles after multithreading changes.

[Brecht Van Lommel]

Revision: 46366
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46366
Author:   blendix
Date:     2012-05-06 22:06:14 +0000 (Sun, 06 May 2012)
Log Message:
-----------
Fix float image loading crash in cycles after multithreading changes.

Modified Paths:
--------------
    trunk/blender/intern/cycles/render/image.cpp

Modified: trunk/blender/intern/cycles/render/image.cpp
===================================================================
--- trunk/blender/intern/cycles/render/image.cpp	2012-05-06 21:50:47 UTC (rev 46365)
+++ trunk/blender/intern/cycles/render/image.cpp	2012-05-06 22:06:14 UTC (rev 46366)
@@ -344,7 +344,7 @@
 	}
 
 	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];