diff options
| author | Pablo Vazquez <pablo@blender.org> | 2021-10-04 17:21:26 +0300 |
|---|---|---|
| committer | Pablo Vazquez <pablo@blender.org> | 2021-10-04 17:21:26 +0300 |
| commit | f0731bd5ac78856e69f1ee09e4762e7d42dc17c9 (patch) | |
| tree | af1576c25c72517e970fbe07a4a7ad2d1248004f /intern/cycles/kernel/shaders/node_normal_map.osl | |
| parent | 2c5661682b61ac4a8a8f45f77a4eff7b85f6f141 (diff) | |
| parent | 4a3464050c4e83d446d47c946e17b9540f5a3862 (diff) | |
Merge branch 'master' into temp-ui-tweakstemp-ui-tweaks
Diffstat (limited to 'intern/cycles/kernel/shaders/node_normal_map.osl')
| -rw-r--r-- | intern/cycles/kernel/shaders/node_normal_map.osl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/shaders/node_normal_map.osl b/intern/cycles/kernel/shaders/node_normal_map.osl index 6d4780f6dae..7a94ad8ad1a 100644 --- a/intern/cycles/kernel/shaders/node_normal_map.osl +++ b/intern/cycles/kernel/shaders/node_normal_map.osl @@ -45,7 +45,7 @@ shader node_normal_map(normal NormalIn = N, // get _unnormalized_ interpolated normal and tangent if (getattribute(attr_name, tangent) && getattribute(attr_sign_name, tangent_sign) && - (!is_smooth || getattribute("geom:N", ninterp))) { + (!is_smooth || getattribute("geom:normal_map_normal", ninterp))) { // apply normal map vector B = tangent_sign * cross(ninterp, tangent); Normal = normalize(mcolor[0] * tangent + mcolor[1] * B + mcolor[2] * ninterp); |