[Bf-blender-cvs] [7be999b952e] temp-geometry-nodes-distribute-points-cleanup: Big fix: was using size_t instead of float

Dalai Felinto noreply at git.blender.org
Fri Dec 11 02:00:50 CET 2020


Commit: 7be999b952e347fdc31e11b73fd1118363c2b888
Author: Dalai Felinto
Date:   Fri Dec 11 01:26:03 2020 +0100
Branches: temp-geometry-nodes-distribute-points-cleanup
https://developer.blender.org/rB7be999b952e347fdc31e11b73fd1118363c2b888

Big fix: was using size_t instead of float

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

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

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

diff --git a/source/blender/nodes/geometry/nodes/node_geo_point_distribute_poisson_disk.cc b/source/blender/nodes/geometry/nodes/node_geo_point_distribute_poisson_disk.cc
index bdf156834c0..5c04a439ca0 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_point_distribute_poisson_disk.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_point_distribute_poisson_disk.cc
@@ -89,8 +89,8 @@ static void points_distance_weight_calculate(std::vector<float> *weights,
                                              const size_t point_id,
                                              Vector<float3> const *input_points,
                                              const void *kd_tree,
-                                             const size_t minimum_distance,
-                                             const size_t maximum_distance,
+                                             const float minimum_distance,
+                                             const float maximum_distance,
                                              Heap *heap,
                                              std::vector<HeapNode *> *nodes)
 {
@@ -149,9 +149,9 @@ static void weighted_sample_elimination(Vector<float3> const *input_points,
                                         const float maximum_distance,
                                         const float3 boundbox)
 {
-  const size_t minimum_distance = maximum_distance *
-                                  weight_limit_fraction_get(input_points->size(),
-                                                            output_points->size());
+  const float minimum_distance = maximum_distance *
+                                 weight_limit_fraction_get(input_points->size(),
+                                                           output_points->size());
 
   void *kd_tree = BLI_kdtree_3d_new(input_points->size());
   {



More information about the Bf-blender-cvs mailing list