Commit: 5379633e59fa81dde204aee77eea86d71443e069 Author: Fabian Schempp Date: Thu Jun 24 23:11:39 2021 +0200 Branches: gsoc-2021-porting-modifiers-to-nodes-solidify https://developer.blender.org/rB5379633e59fa81dde204aee77eea86d71443e069
- corrected two comments in corresponding test =================================================================== M source/blender/blenkernel/intern/solidify_nonmanifold.c M source/blender/makesrna/intern/rna_nodetree.c M source/blender/nodes/geometry/nodes/node_geo_solidify.cc =================================================================== diff --git a/source/blender/blenkernel/intern/solidify_nonmanifold.c b/source/blender/blenkernel/intern/solidify_nonmanifold.c index 574ab975081..0b8d3f9b251 100644 --- a/source/blender/blenkernel/intern/solidify_nonmanifold.c +++ b/source/blender/blenkernel/intern/solidify_nonmanifold.c @@ -2455,7 +2455,7 @@ Mesh *solidify_nonmanifold(const SolidifyData *solidify_data, /* Haven't found a good way to generalize this. */ // if (edge_index != numNewEdges) { /*BKE_modifier_set_error(ctx->object, - md, + md,A "Internal Error: edges array wrong size: %u instead of %u", numNewEdges, edge_index);*/ diff --git a/source/blender/makesrna/intern/rna_nodetree.c b/source/blender/makesrna/intern/rna_nodetree.c index a161728d721..578f07ed11e 100644 --- a/source/blender/makesrna/intern/rna_nodetree.c +++ b/source/blender/makesrna/intern/rna_nodetree.c @@ -9548,13 +9548,12 @@ static void def_geo_solidify(StructRNA *srna) prop = RNA_def_property(srna, "thickness_mode", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, rna_node_geometry_attribute_input_type_items_float); - RNA_def_property_enum_default(prop, 1); RNA_def_property_ui_text(prop, "Thickness", ""); RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update"); prop = RNA_def_property(srna, "nonmanifold_offset_mode", PROP_ENUM, PROP_NONE); RNA_def_property_enum_items(prop, nonmanifold_thickness_mode_items); - RNA_def_property_ui_text(prop, "Thickness", ""); + RNA_def_property_ui_text(prop, "Mode", ""); RNA_def_property_update(prop, NC_NODE | NA_EDITED, "rna_Node_socket_update"); prop = RNA_def_property(srna, "nonmanifold_boundary_mode", PROP_ENUM, PROP_NONE); diff --git a/source/blender/nodes/geometry/nodes/node_geo_solidify.cc b/source/blender/nodes/geometry/nodes/node_geo_solidify.cc index a95b150f1de..a6f596f6472 100644 --- a/source/blender/nodes/geometry/nodes/node_geo_solidify.cc +++ b/source/blender/nodes/geometry/nodes/node_geo_solidify.cc @@ -38,7 +38,7 @@ static bNodeSocketTemplate geo_node_solidify_in[] = { {SOCK_FLOAT, N_("Offset"), -1.0f, 0.0f, 0.0f, 0.0f, -1.0f, 1.0f, PROP_FACTOR}, {SOCK_BOOLEAN, N_("Fill"), true}, {SOCK_BOOLEAN, N_("Rim"), true}, - {SOCK_STRING, N_("Shell Faces")}, + {SOCK_STRING, N_("Fill Faces")}, {SOCK_STRING, N_("Rim Faces")}, {-1, ""}, }; @@ -56,6 +56,7 @@ static void geo_node_solidify_init(bNodeTree *UNUSED(tree), bNode *node) sizeof(NodeGeometrySolidify), __func__); node->storage = node_storage; + node_storage->thickness_mode = GEO_NODE_ATTRIBUTE_INPUT_FLOAT; } static void geo_node_solidify_layout(uiLayout *layout, bContext *UNUSED(C), PointerRNA *ptr) @@ -147,10 +148,9 @@ static void geo_node_solidify_exec(GeoNodeExecParams params) geometry_set.replace_mesh(output_mesh); - const AttributeDomain result_point_domain = ATTR_DOMAIN_POINT; const AttributeDomain result_face_domain = ATTR_DOMAIN_FACE; - const std::string shell_faces_attribute_name = params.get_input<std::string>("Shell Faces"); + const std::string shell_faces_attribute_name = params.get_input<std::string>("Fill Faces"); const std::string rim_faces_attribute_name = params.get_input<std::string>("Rim Faces"); if (solidify_node_data.flag & MOD_SOLIDIFY_SHELL) { @@ -194,7 +194,7 @@ void register_node_type_geo_solidify() node_type_storage( &ntype, "NodeGeometrySolidify", node_free_standard_storage, node_copy_standard_storage); node_type_init(&ntype, blender::nodes::geo_node_solidify_init); - node_type_size(&ntype, 167, 100, 600); + node_type_size(&ntype, 172, 100, 600); node_type_update(&ntype, blender::nodes::geo_node_solidify_update); ntype.geometry_node_execute = blender::nodes::geo_node_solidify_exec; ntype.draw_buttons = blender::nodes::geo_node_solidify_layout; _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org List details, subscription details or unsubscribe: https://lists.blender.org/mailman/listinfo/bf-blender-cvs