[Bf-blender-cvs] [9953a1015d9] soc-2019-cycles-procedural: Remove duplicate float4_to_float3 function.

OmarSquircleArt noreply at git.blender.org
Thu Aug 1 12:12:58 CEST 2019


Commit: 9953a1015d9056b9041b450845e483acf1a96da5
Author: OmarSquircleArt
Date:   Thu Aug 1 12:14:08 2019 +0200
Branches: soc-2019-cycles-procedural
https://developer.blender.org/rB9953a1015d9056b9041b450845e483acf1a96da5

Remove duplicate float4_to_float3 function.

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

M	intern/cycles/util/util_math.h

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

diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h
index a1b909ff25d..7b0a967f8bb 100644
--- a/intern/cycles/util/util_math.h
+++ b/intern/cycles/util/util_math.h
@@ -368,11 +368,6 @@ ccl_device_inline float4 float3_to_float4(const float3 a)
   return make_float4(a.x, a.y, a.z, 1.0f);
 }
 
-ccl_device_inline float3 float4_to_float3(const float3 a)
-{
-  return make_float3(a.x, a.y, a.z);
-}
-
 ccl_device_inline float inverse_lerp(float a, float b, float x)
 {
   return (x - a) / (b - a);



More information about the Bf-blender-cvs mailing list