Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2020-02-16 16:07:46 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2020-02-16 16:07:46 +0300
commitf6d5a9551380581167a907c5b56a6401edce601b (patch)
treee48b9193a7d8497716be3542bb0e6060fecb0356 /source/blender/gpu/intern/gpu_codegen.c
parent071639442344bc8fd689456108bbea0bfd527037 (diff)
Fix T73880: error rendering UDIM in Eevee after recent refactor
Diffstat (limited to 'source/blender/gpu/intern/gpu_codegen.c')
-rw-r--r--source/blender/gpu/intern/gpu_codegen.c4
1 files changed, 3 insertions, 1 deletions
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);