[Bf-blender-cvs] [6dc979e2f96] master: Cycles: Suppress OSL normalize function warnings.

[OmarSquircleArt]

Commit: 6dc979e2f96caa44fdbd3728fca324948d8c6001
Author: OmarSquircleArt
Date:   Sat Jan 18 19:19:26 2020 +0200
Branches: master
https://developer.blender.org/rB6dc979e2f96caa44fdbd3728fca324948d8c6001

Cycles: Suppress OSL normalize function warnings.

This patch suppress the OSL warnings resulted from ambiguous calls
to the normalize function. This is done by casting to the vector
type before normalizing.

Reviewed By: Brecht

Differential Revision: https://developer.blender.org/D6621

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

M	intern/cycles/kernel/shaders/node_ies_light.osl
M	intern/cycles/kernel/shaders/node_mapping.osl
M	intern/cycles/kernel/shaders/node_voronoi_texture.osl

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

diff --git a/intern/cycles/kernel/shaders/node_ies_light.osl b/intern/cycles/kernel/shaders/node_ies_light.osl
index 6e9181cde40..4d881eb3b65 100644
--- a/intern/cycles/kernel/shaders/node_ies_light.osl
+++ b/intern/cycles/kernel/shaders/node_ies_light.osl
@@ -31,7 +31,7 @@ shader node_ies_light(int use_mapping = 0,
     p = transform(mapping, p);
   }
 
-  p = normalize(p);
+  p = normalize((vector)p);
 
   float v_angle = acos(-p[2]);
   float h_angle = atan2(p[0], p[1]) + M_PI;
diff --git a/intern/cycles/kernel/shaders/node_mapping.osl b/intern/cycles/kernel/shaders/node_mapping.osl
index 8eed0ae9c48..e8a9d940eda 100644
--- a/intern/cycles/kernel/shaders/node_mapping.osl
+++ b/intern/cycles/kernel/shaders/node_mapping.osl
@@ -65,7 +65,7 @@ shader node_mapping(string type = "point",
     VectorOut = transform(euler_to_mat(Rotation), (VectorIn * Scale));
   }
   else if (type == "normal") {
-    VectorOut = normalize(transform(euler_to_mat(Rotation), safe_divide(VectorIn, Scale)));
+    VectorOut = normalize((vector)transform(euler_to_mat(Rotation), safe_divide(VectorIn, Scale)));
   }
   else {
     warning("%s", "Unknown Mapping vector type!");
diff --git a/intern/cycles/kernel/shaders/node_voronoi_texture.osl b/intern/cycles/kernel/shaders/node_voronoi_texture.osl
index 5de4aeef943..10a9f7a6329 100644
--- a/intern/cycles/kernel/shaders/node_voronoi_texture.osl
+++ b/intern/cycles/kernel/shaders/node_voronoi_texture.osl
@@ -603,7 +603,7 @@ void voronoi_distance_to_edge_3d(vector3 coord, float randomness, output float o
         vector3 perpendicularToEdge = vectorToPoint - vectorToClosest;
         if (dot(perpendicularToEdge, perpendicularToEdge) > 0.0001) {
           float distanceToEdge = dot((vectorToClosest + vectorToPoint) / 2.0,
-                                     normalize(perpendicularToEdge));
+                                     normalize((vector)perpendicularToEdge));
           minDistance = min(minDistance, distanceToEdge);
         }
       }