forked from bartvdbraak/blender
Fix #27540: bug with bump mapping + reflection texture coordinates + nodes.
This commit is contained in:
parent
aff9f8ce81
commit
4ca197ba59
@ -2192,6 +2192,7 @@ void do_material_tex(ShadeInput *shi)
|
||||
}
|
||||
}
|
||||
else if(mtex->texco==TEXCO_REFL) {
|
||||
calc_R_ref(shi);
|
||||
co= shi->ref; dx= shi->dxref; dy= shi->dyref;
|
||||
}
|
||||
else if(mtex->texco==TEXCO_NORM) {
|
||||
@ -2509,9 +2510,6 @@ void do_material_tex(ShadeInput *shi)
|
||||
shi->orn[0]= -shi->vn[0];
|
||||
shi->orn[1]= -shi->vn[1];
|
||||
shi->orn[2]= -shi->vn[2];
|
||||
|
||||
/* reflection vector */
|
||||
calc_R_ref(shi);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -543,11 +543,6 @@ void shade_input_set_strand_texco(ShadeInput *shi, StrandRen *strand, StrandVert
|
||||
shi->orn[2]= -shi->vn[2];
|
||||
}
|
||||
|
||||
if(texco & TEXCO_REFL) {
|
||||
/* mirror reflection color textures (and envmap) */
|
||||
calc_R_ref(shi); /* wrong location for normal maps! XXXXXXXXXXXXXX */
|
||||
}
|
||||
|
||||
if(texco & TEXCO_STRESS) {
|
||||
/* not supported */
|
||||
}
|
||||
@ -1205,11 +1200,6 @@ void shade_input_set_shade_texco(ShadeInput *shi)
|
||||
shi->orn[2]= -shi->vn[2];
|
||||
}
|
||||
|
||||
if(texco & TEXCO_REFL) {
|
||||
/* mirror reflection color textures (and envmap) */
|
||||
calc_R_ref(shi); /* wrong location for normal maps! XXXXXXXXXXXXXX */
|
||||
}
|
||||
|
||||
if(texco & TEXCO_STRESS) {
|
||||
float *s1, *s2, *s3;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user