[Bf-blender-cvs] [e362b04] master: Fix T48377: Cycles crash removing float image texture node during viewport render.

[Brecht Van Lommel]

Commit: e362b04c43d23ccc4ec14e26d481c283705ef9cf
Author: Brecht Van Lommel
Date:   Sun May 8 19:48:22 2016 +0200
Branches: master
https://developer.blender.org/rBe362b04c43d23ccc4ec14e26d481c283705ef9cf

Fix T48377: Cycles crash removing float image texture node during viewport render.

===================================================================

M	intern/cycles/render/image.cpp

===================================================================

diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index 76a363b..95090ae 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -767,7 +767,7 @@ void ImageManager::device_update(Device *device, DeviceScene *dscene, Progress&
 				continue;
 
 			if(images[type][slot]->users == 0) {
-				device_free_image(device, dscene, slot + tex_image_byte_start);
+				device_free_image(device, dscene, type_index_to_flattened_slot(slot, (ImageDataType)type));
 			}
 			else if(images[type][slot]->need_load) {
 				if(!osl_texture_system || images[type][slot]->builtin_data)