Page MenuHome
Differential D8966 Diff 29639 source/blender/makesrna/intern/rna_modifier.c

Changeset View

Standalone View

View Options

source/blender/makesrna/intern/rna_modifier.c

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 6,227 Lines • ▼ Show 20 Linesstatic void rna_def_modifier_laplaciandeform(BlenderRNA *brna)
RNA_def_property_update(prop, 0, "rna_Modifier_update"); RNA_def_property_update(prop, 0, "rna_Modifier_update");
} }
static void rna_def_modifier_weld(BlenderRNA *brna) static void rna_def_modifier_weld(BlenderRNA *brna)
{ {
StructRNA *srna; StructRNA *srna;
PropertyRNA *prop; PropertyRNA *prop;
static const EnumPropertyItem mode_items[] = {
{MOD_WELD_CONNECTED_MODE, "CONNECTED", 0, "Connected", "Only merge along the edges."},
{MOD_WELD_ALL_MODE, "ALL", 0, "All", "Full merge by distance."},
{0, NULL, 0, NULL, NULL},
brechtUnsubmitted
Not Done
Inline Actions

Perhaps better naming would be:

  • Connected: Only merged connected vertices within the distance
  • All: Merge all vertices within the distance (slower)

Simple & Full don't really explain what this does, and I think merging only connected geometry may in some cases be the desired behavior rather than just a performance optimization.

brecht: Perhaps better naming would be: * Connected: Only merged connected vertices within the distance…
weaselAuthorUnsubmitted
Done
Inline Actions

Agreed. @Germano Cavalcante (mano-wii) as you want to work on the names later anyway, should I do it now or do you want to do this?

weasel: Agreed. @mano-wii as you want to work on the names later anyway, should I do it now or do you…
};
srna = RNA_def_struct(brna, "WeldModifier", "Modifier"); srna = RNA_def_struct(brna, "WeldModifier", "Modifier");
RNA_def_struct_ui_text(srna, "Weld Modifier", "Weld modifier"); RNA_def_struct_ui_text(srna, "Weld Modifier", "Weld modifier");
RNA_def_struct_sdna(srna, "WeldModifierData"); RNA_def_struct_sdna(srna, "WeldModifierData");
RNA_def_struct_ui_icon(srna, ICON_AUTOMERGE_OFF); RNA_def_struct_ui_icon(srna, ICON_AUTOMERGE_OFF);
RNA_define_lib_overridable(true); RNA_define_lib_overridable(true);
prop = RNA_def_property(srna, "mode", PROP_ENUM, PROP_NONE);
RNA_def_property_enum_items(prop, mode_items);
RNA_def_property_ui_text(prop, "Mode", "Mode defines the merge rule.");
RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "merge_threshold", PROP_FLOAT, PROP_DISTANCE); prop = RNA_def_property(srna, "merge_threshold", PROP_FLOAT, PROP_DISTANCE);
RNA_def_property_float_sdna(prop, NULL, "merge_dist"); RNA_def_property_float_sdna(prop, NULL, "merge_dist");
RNA_def_property_range(prop, 0, FLT_MAX); RNA_def_property_range(prop, 0, FLT_MAX);
RNA_def_property_ui_range(prop, 0, 1, 0.001, 6); RNA_def_property_ui_range(prop, 0, 1, 0.001, 6);
RNA_def_property_ui_text(prop, "Merge Distance", "Limit below which to merge vertices"); RNA_def_property_ui_text(prop, "Merge Distance", "Limit below which to merge vertices");
RNA_def_property_update(prop, 0, "rna_Modifier_update"); RNA_def_property_update(prop, 0, "rna_Modifier_update");
prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE); prop = RNA_def_property(srna, "vertex_group", PROP_STRING, PROP_NONE);
▲ Show 20 Lines • Show All 944 Lines • Show Last 20 Lines