[Bf-blender-cvs] [751679edc27] gsoc-2021-porting-modifiers-to-nodes-solidify: moved solidify to Blender Kernel
Fabian Schempp
noreply at git.blender.org
Tue Jun 22 10:49:52 CEST 2021
Commit: 751679edc274c84a244fce5b54cd78f784a45664
Author: Fabian Schempp
Date: Tue Jun 1 07:15:56 2021 +0200
Branches: gsoc-2021-porting-modifiers-to-nodes-solidify
https://developer.blender.org/rB751679edc274c84a244fce5b54cd78f784a45664
moved solidify to Blender Kernel
===================================================================
R099 source/blender/nodes/geometry/nodes/node_geo_solidify_extrude.c source/blender/blenkernel/intern/solidify_extrude.c
R100 source/blender/nodes/geometry/nodes/node_geo_solidify.cc source/blender/nodes/geometry/nodes/node_geo_solidifiy.cc
D source/blender/nodes/geometry/nodes/node_geo_solidify.h
===================================================================
diff --git a/source/blender/nodes/geometry/nodes/node_geo_solidify_extrude.c b/source/blender/blenkernel/intern/solidify_extrude.c
similarity index 99%
rename from source/blender/nodes/geometry/nodes/node_geo_solidify_extrude.c
rename to source/blender/blenkernel/intern/solidify_extrude.c
index 1337923cc78..ed78a97a337 100644
--- a/source/blender/nodes/geometry/nodes/node_geo_solidify_extrude.c
+++ b/source/blender/blenkernel/intern/solidify_extrude.c
@@ -35,7 +35,7 @@
#include "BKE_deform.h"
#include "BKE_mesh.h"
#include "BKE_particle.h"
-#include "node_geo_solidify.h"
+#include "BKE_solidifiy.h"
//#include "node_geometry_util.hh"
@@ -185,7 +185,7 @@ static void mesh_calc_hq_normal(Mesh *mesh, float (*poly_nors)[3], float (*r_ver
/** \name Main Solidify Function
* \{ */
-Mesh *solidify_extrude_modifyMesh(SolidifyNodeData *smd, Mesh *mesh)
+Mesh *solidify_extrude(SolidifyData *smd, Mesh *mesh)
{
Mesh *result;
diff --git a/source/blender/nodes/geometry/nodes/node_geo_solidify.cc b/source/blender/nodes/geometry/nodes/node_geo_solidifiy.cc
similarity index 100%
rename from source/blender/nodes/geometry/nodes/node_geo_solidify.cc
rename to source/blender/nodes/geometry/nodes/node_geo_solidifiy.cc
diff --git a/source/blender/nodes/geometry/nodes/node_geo_solidify.h b/source/blender/nodes/geometry/nodes/node_geo_solidify.h
deleted file mode 100644
index bda46dc5150..00000000000
--- a/source/blender/nodes/geometry/nodes/node_geo_solidify.h
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-// Created by fabian on 24.05.21.
-//
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef struct SolidifyNodeData {
- /** Name of vertex group to use, MAX_VGROUP_NAME. */
- char defgrp_name[64];
- char shell_defgrp_name[64];
- char rim_defgrp_name[64];
- /** New surface offset level. */
- float offset;
- /** Midpoint of the offset. */
- float offset_fac;
- /**
- * Factor for the minimum weight to use when vertex-groups are used,
- * avoids 0.0 weights giving duplicate geometry.
- */
- float offset_fac_vg;
- /** Clamp offset based on surrounding geometry. */
- float offset_clamp;
- char mode;
-
- /** Variables for #MOD_SOLIDIFY_MODE_NONMANIFOLD. */
- char nonmanifold_offset_mode;
- char nonmanifold_boundary_mode;
-
- char _pad;
- float crease_inner;
- float crease_outer;
- float crease_rim;
- int flag;
- short mat_ofs;
- short mat_ofs_rim;
-
- float merge_tolerance;
- float bevel_convex;
-} SolidifyNodeData;
-
-Mesh *solidify_extrude_modifyMesh(SolidifyNodeData *smd, Mesh *mesh);
-
-#ifdef __cplusplus
-}
-#endif
More information about the Bf-blender-cvs
mailing list