[Bf-blender-cvs] [ff3b8b1] cycles_panorama_experiments: Fix compilation error after recent merge

[Sergey Sharybin]

Commit: ff3b8b1d8ed76eb3e4203aae8d7e6fc5b8954756
Author: Sergey Sharybin
Date:   Mon May 16 10:43:38 2016 +0200
Branches: cycles_panorama_experiments
https://developer.blender.org/rBff3b8b1d8ed76eb3e4203aae8d7e6fc5b8954756

Fix compilation error after recent merge

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

M	intern/cycles/render/image.cpp

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

diff --git a/intern/cycles/render/image.cpp b/intern/cycles/render/image.cpp
index 42df7e0..6169a8c 100644
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@ -1108,14 +1108,9 @@ void ImageManager::device_free(Device *device, DeviceScene *dscene)
 int2 ImageManager::get_image_resolution(int slot)
 {
 	assert(slot >= 0);
-	Image *image;
-	if(slot >= tex_image_byte_start) {
-		image = images[slot - tex_image_byte_start];
-	}
-	else {
-		image = float_images[slot];
-	}
-
+	ImageDataType type;
+	int index = flattened_slot_to_type_index(slot, &type);
+	Image *image = images[type][index];
 	assert(image != NULL);
 
 	int width = -1, height = -1;