[Bf-blender-cvs] [17be2149a80] master: Fix T84106: attribute mix node worked incorrectly on float attributes

Jacques Lucke noreply at git.blender.org
Mon Jan 4 10:44:05 CET 2021


Commit: 17be2149a805a3f43a10ff6f800ada429889aa6b
Author: Jacques Lucke
Date:   Mon Jan 4 10:43:56 2021 +0100
Branches: master
https://developer.blender.org/rB17be2149a805a3f43a10ff6f800ada429889aa6b

Fix T84106: attribute mix node worked incorrectly on float attributes

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

M	source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc

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

diff --git a/source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc b/source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc
index 2f2558a2d53..3d3a72dd910 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_attribute_mix.cc
@@ -55,7 +55,7 @@ static void do_mix_operation_float(const int blend_mode,
     float3 a{inputs_a[i]};
     const float3 b{inputs_b[i]};
     ramp_blend(blend_mode, a, factor, b);
-    const float result = a.length();
+    const float result = a.x;
     results.set(i, result);
   }
 }



More information about the Bf-blender-cvs mailing list