blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 748 Projects 19 Wiki Activity

Revert "material Glsl: Fix tangent with new orco." 

This reverts commit 3888227a7b.

This "Fix" was made while ORCO was broken. Now that orco itself is fixed
this is no longer required, otherwise Tangent node produces different
results in Cycles and Eevee.
This commit is contained in:
Dalai Felinto 2017-08-25 15:37:27 +02:00
parent 52778ce625
commit ae04e27bfa
Notes: blender-bot 2023-02-14 06:37:01 +01:00 
Referenced by issue #52653, Render output of linked scenes conflicts with other scenes with the same name
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/blender/gpu/shaders/gpu_shader_material.glsl
View File

@ -3092,17 +3092,17 @@ void node_uvmap(vec3 attr_uv, out vec3 outvec)
void tangent_orco_x(vec3 orco_in, out vec3 orco_out)
{
orco_out = orco_in.xzy * vec3(0.0, -0.25, 0.25);
orco_out = vec3(0.0, (orco_in.z - 0.5) * -0.5, (orco_in.y - 0.5) * 0.5);
}
void tangent_orco_y(vec3 orco_in, out vec3 orco_out)
{
orco_out = orco_in.zyx * vec3(-0.25, 0.0, 0.25);
orco_out = vec3((orco_in.z - 0.5) * -0.5, 0.0, (orco_in.x - 0.5) * 0.5);
}
void tangent_orco_z(vec3 orco_in, out vec3 orco_out)
{
orco_out = orco_in.yxz * vec3(-0.25, 0.25, 0.0);
orco_out = vec3((orco_in.y - 0.5) * -0.5, (orco_in.x - 0.5) * 0.5, 0.0);
}
void node_tangentmap(vec4 attr_tangent, mat4 toworld, out vec3 tangent)