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:
-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);