Commit: 9722c8348dd512e5f5ba30f6a5c752bccf56d747
Author: Fabian Schempp
Date: Sun Jun 27 10:28:21 2021 +0200
Branches: soc-2021-porting-modifiers-to-nodes-decimate
https://developer.blender.org/rB9722c8348dd512e5f5ba30f6a5c752bccf56d747
Merge branch 'master' into gsoc-2021-porting-modifiers-to-nodes-decimate
# Conflicts:
# source/blender/blenkernel/BKE_node.h
# source/blender/blenkernel/intern/node.cc
# source/blender/nodes/CMakeLists.txt
# source/blender/nodes/NOD_geometry.h
# source/blender/nodes/NOD_static_types.h
===================================================================
===================================================================
diff --cc source/blender/blenkernel/BKE_node.h
index 83fcde2b9b6,a0f6be6b3e9..6b300dc5559
--- a/source/blender/blenkernel/BKE_node.h
+++ b/source/blender/blenkernel/BKE_node.h
@@@ -1422,7 -1426,19 +1426,20 @@@ int ntreeTexExecTree(struct bNodeTree *
#define GEO_NODE_ATTRIBUTE_CURVE_MAP 1046
#define GEO_NODE_CURVE_RESAMPLE 1047
#define GEO_NODE_ATTRIBUTE_VECTOR_ROTATE 1048
- #define GEO_NODE_DECIMATE 1049
+ #define GEO_NODE_MATERIAL_ASSIGN 1049
+ #define GEO_NODE_INPUT_MATERIAL 1050
+ #define GEO_NODE_MATERIAL_REPLACE 1051
+ #define GEO_NODE_MESH_TO_CURVE 1052
+ #define GEO_NODE_DELETE_GEOMETRY 1053
+ #define GEO_NODE_CURVE_LENGTH 1054
+ #define GEO_NODE_SELECT_BY_MATERIAL 1055
+ #define GEO_NODE_CONVEX_HULL 1056
+ #define GEO_NODE_CURVE_TO_POINTS 1057
+ #define GEO_NODE_CURVE_REVERSE 1058
+ #define GEO_NODE_SEPARATE_COMPONENTS 1059
+ #define GEO_NODE_CURVE_SUBDIVIDE 1060
+ #define GEO_NODE_RAYCAST 1061
++#define GEO_NODE_DECIMATE 1062
/** \} */
diff --cc source/blender/blenkernel/intern/node.cc
index f55b810e7a4,cf0dd75ea9d..7884998f9e4
--- a/source/blender/blenkernel/intern/node.cc
+++ b/source/blender/blenkernel/intern/node.cc
@@@ -5050,12 -5052,20 +5052,21 @@@ static void registerGeometryNodes(
register_node_type_geo_boolean();
register_node_type_geo_bounding_box();
register_node_type_geo_collection_info();
+ register_node_type_geo_convex_hull();
+ register_node_type_geo_curve_length();
register_node_type_geo_curve_to_mesh();
+ register_node_type_geo_curve_to_points();
register_node_type_geo_curve_resample();
+ register_node_type_geo_curve_reverse();
+ register_node_type_geo_curve_subdivide();
+ register_node_type_geo_decimate();
+ register_node_type_geo_delete_geometry();
register_node_type_geo_edge_split();
+ register_node_type_geo_input_material();
register_node_type_geo_is_viewport();
register_node_type_geo_join_geometry();
+ register_node_type_geo_material_assign();
+ register_node_type_geo_material_replace();
register_node_type_geo_mesh_primitive_circle();
register_node_type_geo_mesh_primitive_cone();
register_node_type_geo_mesh_primitive_cube();
diff --cc source/blender/nodes/CMakeLists.txt
index 8aa4b695217,39f26737620..99d44bb7ff9
--- a/source/blender/nodes/CMakeLists.txt
+++ b/source/blender/nodes/CMakeLists.txt
@@@ -162,12 -162,20 +162,21 @@@ set(SR
geometry/nodes/node_geo_bounding_box.cc
geometry/nodes/node_geo_collection_info.cc
geometry/nodes/node_geo_common.cc
+ geometry/nodes/node_geo_convex_hull.cc
- geometry/nodes/node_geo_curve_length.cc
++ geometry/nodes/node_geo_curve_length.cc
geometry/nodes/node_geo_curve_to_mesh.cc
+ geometry/nodes/node_geo_curve_to_points.cc
geometry/nodes/node_geo_curve_resample.cc
- geometry/nodes/node_geo_decimate.cc
+ geometry/nodes/node_geo_curve_reverse.cc
+ geometry/nodes/node_geo_curve_subdivide.cc
+ geometry/nodes/node_geo_delete_geometry.cc
++
geometry/nodes/node_geo_edge_split.cc
+ geometry/nodes/node_geo_input_material.cc
geometry/nodes/node_geo_is_viewport.cc
geometry/nodes/node_geo_join_geometry.cc
+ geometry/nodes/node_geo_material_assign.cc
+ geometry/nodes/node_geo_material_replace.cc
geometry/nodes/node_geo_mesh_primitive_circle.cc
geometry/nodes/node_geo_mesh_primitive_cone.cc
geometry/nodes/node_geo_mesh_primitive_cube.cc
diff --cc source/blender/nodes/NOD_geometry.h
index ba2eeac449c,fddaaf6e640..c5fd4ec2597
--- a/source/blender/nodes/NOD_geometry.h
+++ b/source/blender/nodes/NOD_geometry.h
@@@ -50,12 -50,20 +50,21 @@@ void register_node_type_geo_attribute_r
void register_node_type_geo_boolean(void);
void register_node_type_geo_bounding_box(void);
void register_node_type_geo_collection_info(void);
+ void register_node_type_geo_convex_hull(void);
+ void register_node_type_geo_curve_length(void);
void register_node_type_geo_curve_to_mesh(void);
+ void register_node_type_geo_curve_to_points(void);
void register_node_type_geo_curve_resample(void);
+ void register_node_type_geo_curve_reverse(void);
+ void register_node_type_geo_curve_subdivide(void);
+ void register_node_type_geo_delete_geometry(void);
+void register_node_type_geo_decimate(void);
void register_node_type_geo_edge_split(void);
+ void register_node_type_geo_input_material(void);
void register_node_type_geo_is_viewport(void);
void register_node_type_geo_join_geometry(void);
+ void register_node_type_geo_material_assign(void);
+ void register_node_type_geo_material_replace(void);
void register_node_type_geo_mesh_primitive_circle(void);
void register_node_type_geo_mesh_primitive_cone(void);
void register_node_type_geo_mesh_primitive_cube(void);
diff --cc source/blender/nodes/NOD_static_types.h
index b31cdf6951e,d79fa7bffb3..b1a96d3ef42
--- a/source/blender/nodes/NOD_static_types.h
+++ b/source/blender/nodes/NOD_static_types.h
@@@ -289,12 -289,20 +289,21 @@@ DefNode(GeometryNode, GEO_NODE_ATTRIBUT
DefNode(GeometryNode, GEO_NODE_BOOLEAN, def_geo_boolean, "BOOLEAN", Boolean,
"Boolean", "")
DefNode(GeometryNode, GEO_NODE_BOUNDING_BOX, 0, "BOUNDING_BOX", BoundBox,
"Bounding Box", "")
DefNode(GeometryNode, GEO_NODE_COLLECTION_INFO, def_geo_collection_info,
"COLLECTION_INFO", CollectionInfo, "Collection Info", "")
+ DefNode(GeometryNode, GEO_NODE_CONVEX_HULL, 0, "CONVEX_HULL", ConvexHull,
"Convex Hull", "")
+ DefNode(GeometryNode, GEO_NODE_CURVE_LENGTH, 0, "CURVE_LENGTH", CurveLength,
"Curve Length", "")
DefNode(GeometryNode, GEO_NODE_CURVE_RESAMPLE, def_geo_curve_resample,
"CURVE_RESAMPLE", CurveResample, "Resample Curve", "")
+ DefNode(GeometryNode, GEO_NODE_CURVE_SUBDIVIDE, def_geo_curve_subdivide,
"CURVE_SUBDIVIDE", CurveSubdivide, "Curve Subdivide", "")
DefNode(GeometryNode, GEO_NODE_CURVE_TO_MESH, 0, "CURVE_TO_MESH",
CurveToMesh, "Curve to Mesh", "")
+DefNode(GeometryNode, GEO_NODE_DECIMATE, 0, "DECIMATE", Decimate, "Decimate",
"")
+ DefNode(GeometryNode, GEO_NODE_CURVE_REVERSE, 0, "CURVE_REVERSE",
CurveReverse, "Curve Reverse", "")
+ DefNode(GeometryNode, GEO_NODE_CURVE_TO_POINTS, def_geo_curve_to_points,
"CURVE_TO_POINTS", CurveToPoints, "Curve to Points", "")
+ DefNode(GeometryNode, GEO_NODE_DELETE_GEOMETRY, 0, "DELETE_GEOMETRY",
DeleteGeometry, "Delete Geometry", "")
DefNode(GeometryNode, GEO_NODE_EDGE_SPLIT, 0, "EDGE_SPLIT", EdgeSplit, "Edge
Split", "")
+ DefNode(GeometryNode, GEO_NODE_INPUT_MATERIAL, def_geo_input_material,
"INPUT_MATERIAL", InputMaterial, "Material", "")
DefNode(GeometryNode, GEO_NODE_IS_VIEWPORT, 0, "IS_VIEWPORT", IsViewport, "Is
Viewport", "")
DefNode(GeometryNode, GEO_NODE_JOIN_GEOMETRY, 0, "JOIN_GEOMETRY",
JoinGeometry, "Join Geometry", "")
+ DefNode(GeometryNode, GEO_NODE_MATERIAL_ASSIGN, 0, "MATERIAL_ASSIGN",
MaterialAssign, "Material Assign", "")
+ DefNode(GeometryNode, GEO_NODE_MATERIAL_REPLACE, 0, "MATERIAL_REPLACE",
MaterialReplace, "Material Replace", "")
DefNode(GeometryNode, GEO_NODE_MESH_PRIMITIVE_CIRCLE, def_geo_mesh_circle,
"MESH_PRIMITIVE_CIRCLE", MeshCircle, "Circle", "")
DefNode(GeometryNode, GEO_NODE_MESH_PRIMITIVE_CONE, def_geo_mesh_cone,
"MESH_PRIMITIVE_CONE", MeshCone, "Cone", "")
DefNode(GeometryNode, GEO_NODE_MESH_PRIMITIVE_CUBE, 0, "MESH_PRIMITIVE_CUBE",
MeshCube, "Cube", "")
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
List details, subscription details or unsubscribe:
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
