[Bf-blender-cvs] [f6d5a955138] master: Fix T73880: error rendering UDIM in Eevee after recent refactor

[Brecht Van Lommel]

Commit: f6d5a9551380581167a907c5b56a6401edce601b
Author: Brecht Van Lommel
Date:   Sun Feb 16 14:07:46 2020 +0100
Branches: master
https://developer.blender.org/rBf6d5a9551380581167a907c5b56a6401edce601b

Fix T73880: error rendering UDIM in Eevee after recent refactor

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

M	source/blender/gpu/intern/gpu_codegen.c

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

diff --git a/source/blender/gpu/intern/gpu_codegen.c b/source/blender/gpu/intern/gpu_codegen.c
index ed6bf20cff4..6c14d918816 100644
--- a/source/blender/gpu/intern/gpu_codegen.c
+++ b/source/blender/gpu/intern/gpu_codegen.c
@@ -1112,7 +1112,8 @@ static ListBase gpu_nodes_requested_textures(ListBase *nodes)
 
       GPUMaterialTexture *tex = textures.first;
       for (; tex; tex = tex->next) {
-        if (tex->ima == input->ima && tex->colorband == input->colorband) {
+        if (tex->ima == input->ima && tex->colorband == input->colorband &&
+            tex->type == input->type) {
           break;
         }
       }
@@ -1123,6 +1124,7 @@ static ListBase gpu_nodes_requested_textures(ListBase *nodes)
         tex->iuser = input->iuser;
         tex->colorband = input->colorband;
         tex->id = num_textures++;
+        tex->type = input->type;
         BLI_snprintf(tex->shadername, sizeof(tex->shadername), "samp%d", tex->id);
         BLI_addtail(&textures, tex);