From e362b04c43d23ccc4ec14e26d481c283705ef9cf Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@gmail.com>
Date: Sun, 8 May 2016 19:48:22 +0200
Subject: [PATCH] Fix T48377: Cycles crash removing float image texture node
 during viewport render.

---
 intern/cycles/render/image.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index 76a363b6bb7..95090ae8356 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)