diff options
| author | mano-wii <germano.costa@ig.com.br> | 2019-08-26 20:15:25 +0300 |
|---|---|---|
| committer | mano-wii <germano.costa@ig.com.br> | 2019-08-26 20:15:25 +0300 |
| commit | 6b189d2bcf3536231f7040926ed34fe01012f14e (patch) | |
| tree | 66a47b371c5e077fc0251c6e487956b998f6ef3e /source/blender/makesrna | |
| parent | 7273dbd47b7ab7ae0016f17f95e71221fb8773d2 (diff) | |
Edit Mesh: New option "Split Edges & Faces" to "AutoMerge"
Ref T66423
Differential revision: https://developer.blender.org/D5562
Diffstat (limited to 'source/blender/makesrna')
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c index 939572923ac..67c82484864 100644 --- a/source/blender/makesrna/intern/rna_scene.c +++ b/source/blender/makesrna/intern/rna_scene.c @@ -2944,9 +2944,15 @@ static void rna_def_tool_settings(BlenderRNA *brna) RNA_def_property_update(prop, NC_SPACE | ND_SPACE_VIEW3D, NULL); prop = RNA_def_property(srna, "use_mesh_automerge", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "automerge", 0); + RNA_def_property_boolean_sdna(prop, NULL, "automerge", AUTO_MERGE); RNA_def_property_ui_text( - prop, "Auto Merge", "Automatically merge vertices moved to the same location"); + prop, "Auto Merge Vertices", "Automatically merge vertices moved to the same location"); + RNA_def_property_ui_icon(prop, ICON_AUTOMERGE_OFF, 1); + RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); /* header redraw */ + + prop = RNA_def_property(srna, "use_mesh_automerge_and_split", PROP_BOOLEAN, PROP_NONE); + RNA_def_property_boolean_sdna(prop, NULL, "automerge", AUTO_MERGE_AND_SPLIT); + RNA_def_property_ui_text(prop, "Split Edges & Faces", "Automatically split edges and faces"); RNA_def_property_ui_icon(prop, ICON_AUTOMERGE_OFF, 1); RNA_def_property_update(prop, NC_SCENE | ND_TOOLSETTINGS, NULL); /* header redraw */ |