[Bf-blender-cvs] [2fb714443c8] soc-2021-porting-modifiers-to-nodes_all: Merge branch 'soc-2021-porting-modifiers-to-nodes-solidify' into soc-2021-porting-modifiers-to-nodes

Fabian Schempp noreply at git.blender.org
Thu Aug 19 22:07:12 CEST 2021 

Commit: 2fb714443c85f46e64880abcc458b65f7d2cb350
Author: Fabian Schempp
Date:   Tue Aug 17 22:46:29 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes_all
https://developer.blender.org/rB2fb714443c85f46e64880abcc458b65f7d2cb350

Merge branch 'soc-2021-porting-modifiers-to-nodes-solidify' into soc-2021-porting-modifiers-to-nodes

# Conflicts:
#	release/scripts/startup/nodeitems_builtins.py
#	source/blender/blenkernel/BKE_node.h
#	source/blender/geometry/CMakeLists.txt
#	source/blender/makesrna/RNA_enum_types.h
#	source/blender/modifiers/CMakeLists.txt
#	source/blender/nodes/NOD_static_types.h

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



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

diff --cc release/scripts/startup/nodeitems_builtins.py
index 949307be698,85fd0a25853..6a724680b75
--- a/release/scripts/startup/nodeitems_builtins.py
+++ b/release/scripts/startup/nodeitems_builtins.py
@@@ -554,13 -553,7 +554,14 @@@ geometry_node_categories = 
          NodeItem("GeometryNodeEdgeSplit"),
          NodeItem("GeometryNodeSubdivisionSurface"),
          NodeItem("GeometryNodeMeshSubdivide"),
+         NodeItem("GeometryNodeSolidify"),
 +        NodeItem("GeometryNodeRemeshVoxel"),
 +        NodeItem("GeometryNodeRemeshBlocks"),
 +        NodeItem("GeometryNodeMeshExtrude"),
 +        NodeItem("GeometryNodeMeshInset"),
 +        NodeItem("GeometryNodeCollapse"),
 +        NodeItem("GeometryNodeUnsubdivide"),
 +        NodeItem("GeometryNodeDissolve"),
      ]),
      GeometryNodeCategory("GEO_PRIMITIVES_MESH", "Mesh Primitives", items=[
          NodeItem("GeometryNodeMeshCircle"),
diff --cc source/blender/blenkernel/BKE_node.h
index 70841276dd5,54d3b80fb5c..8e598a34c85
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1477,15 -1477,8 +1477,16 @@@ int ntreeTexExecTree(struct bNodeTree *
  #define GEO_NODE_CURVE_SET_HANDLES 1072
  #define GEO_NODE_CURVE_SPLINE_TYPE 1073
  #define GEO_NODE_CURVE_SELECT_HANDLES 1074
- #define GEO_NODE_REMESH_VOXEL 1075
- #define GEO_NODE_REMESH_BLOCKS 1075
- #define GEO_NODE_MERGE_BY_DISTANCE 1076
- #define GEO_NODE_MESH_EXTRUDE 1076
- #define GEO_NODE_MESH_INSET 1077
- #define GEO_NODE_CURVE_SELECT_HANDLES 1078
- #define GEO_NODE_COLLAPSE 1079
- #define GEO_NODE_UNSUBDIVIDE 1080
- #define GEO_NODE_DISSOLVE 1081
+ #define GEO_NODE_SOLIDIFY 1075
 -
++#define GEO_NODE_REMESH_VOXEL 1076
++#define GEO_NODE_REMESH_BLOCKS 1077
++#define GEO_NODE_MERGE_BY_DISTANCE 1078
++#define GEO_NODE_MESH_EXTRUDE 1079
++#define GEO_NODE_MESH_INSET 1080
++#define GEO_NODE_CURVE_SELECT_HANDLES 1081
++#define GEO_NODE_COLLAPSE 1082
++#define GEO_NODE_UNSUBDIVIDE 1083
++#define GEO_NODE_DISSOLVE 1084
  /** \} */
  
  /* -------------------------------------------------------------------- */
diff --cc source/blender/blenkernel/intern/node.cc
index a31c9a07668,023a8c996b8..251989cb653
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@@ -5189,13 -5185,11 +5189,14 @@@ static void registerGeometryNodes(
    register_node_type_geo_select_by_handle_type();
    register_node_type_geo_select_by_material();
    register_node_type_geo_separate_components();
+   register_node_type_geo_solidify();
    register_node_type_geo_subdivision_surface();
    register_node_type_geo_switch();
 +  register_node_type_geo_remesh_voxel();
 +  register_node_type_geo_remesh_blocks();
    register_node_type_geo_transform();
    register_node_type_geo_triangulate();
 +  register_node_type_geo_unsubdivide();
    register_node_type_geo_viewer();
    register_node_type_geo_volume_to_mesh();
  }
diff --cc source/blender/geometry/CMakeLists.txt
index 02f62ae05dc,94e4f8aa290..f3c6b80aef6
--- a/source/blender/geometry/CMakeLists.txt
+++ b/source/blender/geometry/CMakeLists.txt
@@@ -1,59 -1,39 +1,61 @@@
 -# ***** BEGIN GPL LICENSE BLOCK *****
 -#
 -# This program is free software; you can redistribute it and/or
 -# modify it under the terms of the GNU General Public License
 -# as published by the Free Software Foundation; either version 2
 -# of the License, or (at your option) any later version.
 -#
 -# This program is distributed in the hope that it will be useful,
 -# but WITHOUT ANY WARRANTY; without even the implied warranty of
 -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 -# GNU General Public License for more details.
 -#
 -# You should have received a copy of the GNU General Public License
 -# along with this program; if not, write to the Free Software Foundation,
 -# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 -#
 -# The Original Code is Copyright (C) 2006, Blender Foundation
 -# All rights reserved.
 -# ***** END GPL LICENSE BLOCK *****
 + # ***** BEGIN GPL LICENSE BLOCK *****
 + #
 + # This program is free software; you can redistribute it and/or
 + # modify it under the terms of the GNU General Public License
 + # as published by the Free Software Foundation; either version 2
 + # of the License, or (at your option) any later version.
 + #
 + # This program is distributed in the hope that it will be useful,
 + # but WITHOUT ANY WARRANTY; without even the implied warranty of
 + # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 + # GNU General Public License for more details.
 + #
 + # You should have received a copy of the GNU General Public License
 + # along with this program; if not, write to the Free Software Foundation,
 + # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 + #
 + # The Original Code is Copyright (C) 2006, Blender Foundation
 + # All rights reserved.
 + # ***** END GPL LICENSE BLOCK *****
  
 -set(INC
 -        .
 -        ../blenkernel
 -        ../blenlib
 -        ../makesdna
 -        ../../../intern/guardedalloc
 -        )
 + set(INC
 +         .
 +         ../blenfont
 +         ../blenkernel
 +         ../blenlib
 +         ../blentranslation
 +         ../functions
 +         ../makesdna
 +         ../makesrna
 +         ../../../intern/guardedalloc
 +         ../makesdna/intern
 +         ${CMAKE_BINARY_DIR}/source/blender/makesdna/intern
 +         )
  
 -set(SRC
 -        intern/solidify_nonmanifold.c
 -        GEO_solidifiy.h
 -        )
 + set(SRC
++         intern/solidify_nonmanifold.c
++         GEO_solidifiy.h
 +         intern/remesh_blocks.c
 +         GEO_mesh_remesh_blocks.h
 +         intern/mesh_merge_by_distance.c
 +         intern/pointcloud_merge_by_distance.cc
 +         GEO_mesh_merge_by_distance.h
 +         GEO_pointcloud_merge_by_distance.h
 +         )
  
 -set(LIB
 -        bf_blenkernel
 -        bf_blenlib
 -        )
 + set(LIB
 +         bf_blenkernel
 +         bf_blenlib
 +         )
  
 -blender_add_lib(bf_geometry "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
 + if(WITH_REMESH_DUALCON)
 +   list(APPEND INC
 +       ../../../intern/dualcon
 +       )
 +   list(APPEND LIB
 +       bf_intern_dualcon
 +       )
 +   add_definitions(-DWITH_REMESH_DUALCON)
 + endif()
 +
-  blender_add_lib(bf_geometry "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
++ blender_add_lib(bf_geometry "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
diff --cc source/blender/nodes/CMakeLists.txt
index 3d026f09e79,0c0591eb657..b8ee7473369
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@@ -215,13 -211,11 +215,14 @@@ set(SR
    geometry/nodes/node_geo_raycast.cc
    geometry/nodes/node_geo_select_by_material.cc
    geometry/nodes/node_geo_separate_components.cc
+   geometry/nodes/node_geo_solidify.cc
    geometry/nodes/node_geo_subdivision_surface.cc
    geometry/nodes/node_geo_switch.cc
 +  geometry/nodes/node_geo_remesh_voxel.cc
 +  geometry/nodes/node_geo_remesh_blocks.cc
    geometry/nodes/node_geo_transform.cc
    geometry/nodes/node_geo_triangulate.cc
 +  geometry/nodes/node_geo_unsubdivide.cc
    geometry/nodes/node_geo_viewer.cc
    geometry/nodes/node_geo_volume_to_mesh.cc
    geometry/node_geometry_exec.cc
diff --cc source/blender/nodes/NOD_static_types.h
index c3762ebf4b7,33ff92dbff8..568b6403bb7
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -338,16 -335,13 +338,17 @@@ DefNode(GeometryNode, GEO_NODE_POINT_SE
  DefNode(GeometryNode, GEO_NODE_POINT_TRANSLATE, def_geo_point_translate, "POINT_TRANSLATE", PointTranslate, "Point Translate", "")
  DefNode(GeometryNode, GEO_NODE_POINTS_TO_VOLUME, def_geo_points_to_volume, "POINTS_TO_VOLUME", PointsToVolume, "Points to Volume", "")
  DefNode(GeometryNode, GEO_NODE_RAYCAST, def_geo_raycast, "RAYCAST", Raycast, "Raycast", "")
 +DefNode(GeometryNode, GEO_NODE_MERGE_BY_DISTANCE, def_geo_merge_by_distance, "MERGE_BY_DISTANCE", MergeByDistance, "Merge by Distance", "")
  DefNode(GeometryNode, GEO_NODE_SELECT_BY_MATERIAL, 0, "SELECT_BY_MATERIAL", SelectByMaterial, "Select by Material", "")
  DefNode(GeometryNode, GEO_NODE_SEPARATE_COMPONENTS, 0, "SEPARATE_COMPONENTS", SeparateComponents, "Separate Components", "")
+ DefNode(GeometryNode, GEO_NODE_SOLIDIFY, def_geo_solidify, "SOLIDIFY", Solidify, "Solidify", "")
 -DefNode(GeometryNode, GEO_NODE_SUBDIVISION_SURFACE, 0, "SUBDIVISION_SURFACE", SubdivisionSurface, "Subdivision Surface", "")
 +DefNode(GeometryNode, GEO_NODE_SUBDIVISION_SURFACE, def_geo_subdivision_surface, "SUBDIVISION_SURFACE", SubdivisionSurface, "Subdivision Surface", "")
  DefNode(GeometryNode, GEO_NODE_SWITCH, def_geo_switch, "SWITCH", Switch, "Switch", "")
 +DefNode(GeometryNode, GEO_NODE_REMESH_VOXEL, 0, "REMESH_VOXEL", RemeshVoxel, "Voxel Remesh", "")
 +DefNode(GeometryNode, GEO_NODE_REMESH_BLOCKS, def_geo_remesh_blocks, "REMESH_BLOCKS", RemeshBlocks, "Remesh Blocks", "")
  DefNode(GeometryNode, GEO_NODE_TRANSFORM, 0, "TRANSFORM", Transform, "Transform", "")
  DefNode(GeometryNode, GEO_NODE_TRIANGULATE, def_geo_triangulate, "TRIANGULATE", Triangulate, "Triangulate", "")
 +DefNode(GeometryNode, GEO_NODE_UNSUBDIVIDE, 0, "UNSUBDIVIDE", Unsubdivide, "Unsubdivide", "")
  DefNode(GeometryNode, GEO_NODE_VIEWER, 0, "VIEWER", Viewer, "Viewer", "")
  DefNode(GeometryNode, GEO_NODE_VOLUME_TO_MESH, def_geo_volume_to_mesh, "VOLUME_TO_MESH", VolumeToMesh, "Volume to Mesh", "")

More information about the Bf-blender-cvs mailing list