[Bf-blender-cvs] [7bb572f208b] master: Fix T94737: Cycles wrong normal map normal with OSL

Brecht Van Lommel noreply at git.blender.org
Thu Jan 13 10:50:44 CET 2022


Commit: 7bb572f208bb37fc7e942dcfbbbd974d514d38a8
Author: Brecht Van Lommel
Date:   Thu Jan 13 00:49:58 2022 +0100
Branches: master
https://developer.blender.org/rB7bb572f208bb37fc7e942dcfbbbd974d514d38a8

Fix T94737: Cycles wrong normal map normal with OSL

Ensure valid reflection was moved elsewhere, should not be done in the node
anymore.

===================================================================

M	intern/cycles/kernel/osl/shaders/node_normal_map.osl

===================================================================

diff --git a/intern/cycles/kernel/osl/shaders/node_normal_map.osl b/intern/cycles/kernel/osl/shaders/node_normal_map.osl
index 7a94ad8ad1a..9f365180eae 100644
--- a/intern/cycles/kernel/osl/shaders/node_normal_map.osl
+++ b/intern/cycles/kernel/osl/shaders/node_normal_map.osl
@@ -85,6 +85,4 @@ shader node_normal_map(normal NormalIn = N,
 
   if (Strength != 1.0)
     Normal = normalize(NormalIn + (Normal - NormalIn) * max(Strength, 0.0));
-
-  Normal = ensure_valid_reflection(Ng, I, Normal);
 }



More information about the Bf-blender-cvs mailing list