[Bf-blender-cvs] [d8ed157bd21] temp-udim-images: Merge branch 'blender2.8' into temp-udim-images

[Brecht Van Lommel]

Commit: d8ed157bd21c19cea74722aa92225cd0032ceefa
Author: Brecht Van Lommel
Date:   Thu Jun 14 18:51:02 2018 +0200
Branches: temp-udim-images
https://developer.blender.org/rBd8ed157bd21c19cea74722aa92225cd0032ceefa

Merge branch 'blender2.8' into temp-udim-images

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



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

diff --cc source/blender/draw/intern/draw_manager_data.c
index 805d71eb393,db4e16d362a..3cac6a67bb0
--- a/source/blender/draw/intern/draw_manager_data.c
+++ b/source/blender/draw/intern/draw_manager_data.c
@@@ -766,18 -766,9 +766,18 @@@ static DRWShadingGroup *drw_shgroup_mat
  	for (GPUInput *input = inputs->first; input; input = input->next) {
  		/* Textures */
  		if (input->ima) {
 +			ImageUser *tex_iuser = input->iuser;
 +
 +			/* If there's no specified iuser but we need a different tile, create a temporary one. */
 +			ImageUser iuser = {NULL};
 +			iuser.ok = true;
 +			iuser.tile = input->image_tile;
 +			if (!tex_iuser && iuser.tile != 0)
 +				tex_iuser = &iuser;
 +
  			double time = 0.0; /* TODO make time variable */
  			GPUTexture *tex = GPU_texture_from_blender(
- 			        input->ima, tex_iuser, input->textarget, input->image_isdata, time, 1);
 -			        input->ima, input->iuser, input->textarget, input->image_isdata, time);
++			        input->ima, tex_iuser, input->textarget, input->image_isdata, time);
  
  			if (input->bindtex) {
  				DRW_shgroup_uniform_texture(grp, input->shadername, tex);