blender
/
blender
129
397
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Fix T73880: error rendering UDIM in Eevee after recent refactor

This commit is contained in:
Brecht Van Lommel 2020-02-16 14:07:46 +01:00
parent 0716394423
commit f6d5a95513
Notes: blender-bot 2023-02-14 09:21:21 +01:00 
Referenced by issue #74018, CRLF vs LF mismatches errors when patching OpenCollada in "make deps"
Referenced by issue #73941, Custom normals from normal edit modifier ignored by further modifiers
Referenced by issue #73942, Eevee mipmaps not respecting border mode
Referenced by issue #73944, Generated texture coordinates incorrect on file load in presence of modifiers
Referenced by issue #73880, 2.83 Daily: UDIM Monster demo file causes "GPUShader: compile error: error C1102" errors
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/blender/gpu/intern/gpu_codegen.c
View File

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