[Bf-blender-cvs] [36055ba366a] temp-geometry-nodes-fields-prototype: Remove density max socket from the point distribute node

Hans Goudey noreply at git.blender.org
Tue Aug 3 22:05:17 CEST 2021


Commit: 36055ba366a67fe2eb61888c5da217789f533a4b
Author: Hans Goudey
Date:   Tue Aug 3 16:05:10 2021 -0400
Branches: temp-geometry-nodes-fields-prototype
https://developer.blender.org/rB36055ba366a67fe2eb61888c5da217789f533a4b

Remove density max socket from the point distribute node

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

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

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

diff --git a/source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc b/source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc
index b60c5357f65..ccd6edc806a 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_point_distribute.cc
@@ -42,8 +42,7 @@ using blender::bke::GeometryInstanceGroup;
 static bNodeSocketTemplate geo_node_point_distribute_in[] = {
     {SOCK_GEOMETRY, N_("Geometry")},
     {SOCK_FLOAT, N_("Distance Min"), 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 100000.0f, PROP_DISTANCE},
-    {SOCK_FLOAT, N_("Density Max"), 10.0f, 0.0f, 0.0f, 0.0f, 0.0f, 100000.0f, PROP_NONE},
-    {SOCK_FLOAT, N_("Density Factor"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 100000.0f, PROP_NONE},
+    {SOCK_FLOAT, N_("Density"), 1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 100000.0f, PROP_NONE},
     {SOCK_INT, N_("Seed"), 0, 0, 0, 0, -10000, 10000},
     {-1, ""},
 };
@@ -586,8 +585,8 @@ static void geo_node_point_distribute_exec(GeoNodeExecParams params)
       static_cast<GeometryNodePointDistributeMode>(params.node().custom1);
 
   const int seed = params.get_input<int>("Seed") * 5383843;
-  const float density_max = params.extract_input<float>("Density Max");
-  bke::FieldRef<float> density_field = params.get_input_field<float>("Density Factor");
+  const float density_max = 1.0f;
+  bke::FieldRef<float> density_field = params.get_input_field<float>("Density");
 
   if (density_max <= 0.0f) {
     params.set_output("Geometry", GeometrySet());



More information about the Bf-blender-cvs mailing list