[Bf-blender-cvs] [330851d] soc-2016-cycles_images: Merge branch 'master' into soc-2016-cycles_images

[Thomas Dinges]

Commit: 330851de1ae98ca59286c296022beb04be806b7b
Author: Thomas Dinges
Date:   Mon May 16 21:24:11 2016 +0200
Branches: soc-2016-cycles_images
https://developer.blender.org/rB330851de1ae98ca59286c296022beb04be806b7b

Merge branch 'master' into soc-2016-cycles_images

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



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

diff --cc intern/cycles/render/image.cpp
index 476947d,898e00f..9ac493c
--- a/intern/cycles/render/image.cpp
+++ b/intern/cycles/render/image.cpp
@@@ -818,11 -812,10 +816,11 @@@ void ImageManager::device_load_image(De
  			device->tex_alloc(name.c_str(),
  			                  tex_img,
  			                  img->interpolation,
 -			                  img->extension);
 +			                  img->extension,
 +			                  &bindless_slot);
  		}
  	}
- 	else if(type == IMAGE_DATA_TYPE_BYTE4){
+ 	else if(type == IMAGE_DATA_TYPE_BYTE4) {
  		device_vector<uchar4>& tex_img = dscene->tex_byte4_image[slot];
  
  		if(tex_img.device_pointer) {