[Bf-blender-cvs] [51334dd3a64] master: Fix T69686: Cycles OpenCL build error after recent changes

[Brecht Van Lommel]

Commit: 51334dd3a64ef2fdc4df70e64bad26a95e4358f1
Author: Brecht Van Lommel
Date:   Mon Sep 9 21:03:37 2019 +0200
Branches: master
https://developer.blender.org/rB51334dd3a64ef2fdc4df70e64bad26a95e4358f1

Fix T69686: Cycles OpenCL build error after recent changes

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

M	intern/cycles/kernel/closure/bsdf.h

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

diff --git a/intern/cycles/kernel/closure/bsdf.h b/intern/cycles/kernel/closure/bsdf.h
index c83e97d94c2..b282bf5a350 100644
--- a/intern/cycles/kernel/closure/bsdf.h
+++ b/intern/cycles/kernel/closure/bsdf.h
@@ -447,7 +447,7 @@ ccl_device_inline int bsdf_sample(KernelGlobals *kg,
     }
   }
   else if (label & LABEL_DIFFUSE) {
-    if (sc->N != sd->N) {
+    if (!isequal_float3(sc->N, sd->N)) {
       *eval *= bump_shadowing_term((label & LABEL_TRANSMIT) ? -sd->N : sd->N, sc->N, *omega_in);
     }
   }
@@ -563,7 +563,9 @@ ccl_device_inline
         break;
     }
     if (CLOSURE_IS_BSDF_DIFFUSE(sc->type)) {
-      eval *= bump_shadowing_term(sd->N, sc->N, omega_in);
+      if (!isequal_float3(sc->N, sd->N)) {
+        eval *= bump_shadowing_term(sd->N, sc->N, omega_in);
+      }
     }
   }
   else {
@@ -652,7 +654,9 @@ ccl_device_inline
         break;
     }
     if (CLOSURE_IS_BSDF_DIFFUSE(sc->type)) {
-      eval *= bump_shadowing_term(-sd->N, sc->N, omega_in);
+      if (!isequal_float3(sc->N, sd->N)) {
+        eval *= bump_shadowing_term(-sd->N, sc->N, omega_in);
+      }
     }
   }