[Bf-blender-cvs] [641d268d59b] soc-2021-porting-modifiers-to-nodes-decimate: added factor as slot
Fabian Schempp
noreply at git.blender.org
Fri Jul 2 21:56:49 CEST 2021
Commit: 641d268d59b9f29f96e363428a5f529ab3d18feb
Author: Fabian Schempp
Date: Wed May 26 00:55:37 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-decimate
https://developer.blender.org/rB641d268d59b9f29f96e363428a5f529ab3d18feb
added factor as slot
===================================================================
M source/blender/nodes/geometry/nodes/node_geo_decimate.cc
===================================================================
diff --git a/source/blender/nodes/geometry/nodes/node_geo_decimate.cc b/source/blender/nodes/geometry/nodes/node_geo_decimate.cc
index 6cd779a3c31..4a26c4223c2 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_decimate.cc
+++ b/source/blender/nodes/geometry/nodes/node_geo_decimate.cc
@@ -36,7 +36,7 @@ extern "C" {
static bNodeSocketTemplate geo_node_decimate_in[] = {
{SOCK_GEOMETRY, N_("Geometry")},
- {SOCK_INT, N_("Minimum Vertices"), 4, 0, 0, 0, 4, 10000},
+ {SOCK_FLOAT, N_("Factor"), 0.5f, 0, 0, 0, 0.0f, 1.0f},
{-1, ""},
};
@@ -196,12 +196,12 @@ static Mesh *decimateMesh(DecimateNodeData *dmd, Mesh *meshData)
static void geo_node_decimate_exec(GeoNodeExecParams params)
{
GeometrySet geometry_set = params.extract_input<GeometrySet>("Geometry");
-
+ float percent = params.extract_input<float>("Factor");
if(geometry_set.has_mesh()){
Mesh *input_mesh = geometry_set.get_mesh_for_write();
DecimateNodeData dmd = {
/** (mode == MOD_DECIM_MODE_COLLAPSE). */
- 0.5f,
+ percent,
/** (mode == MOD_DECIM_MODE_UNSUBDIV). */
2,
/** (mode == MOD_DECIM_MODE_DISSOLVE). */
More information about the Bf-blender-cvs
mailing list