Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWilliam Reynish <billrey@me.com>2019-05-22 15:21:31 +0300
committerWilliam Reynish <billrey@me.com>2019-05-22 15:21:31 +0300
commit12c9a9131fd9a6ea8ae060a6914b33a3c7ac5468 (patch)
tree460e160960126500430dab3973f6705a91544313 /source/blender/makesrna
parentf05b9dba26607c319fa2246ec915490f10ca86e6 (diff)
Fix: Auto Merge icon state were wrongly swapped
Diffstat (limited to 'source/blender/makesrna')
-rw-r--r--source/blender/makesrna/intern/rna_scene.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 2a69ca76c22..894f9bfbe3e 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -2857,7 +2857,7 @@ static void rna_def_tool_settings(BlenderRNA *brna)
RNA_def_property_boolean_sdna(prop, NULL, "automerge", 0);
RNA_def_property_ui_text(
prop, "Auto Merge", "Automatically merge vertices moved to the same location");
- RNA_def_property_ui_icon(prop, ICON_AUTOMERGE_OFF, -1);
+ 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_snap", PROP_BOOLEAN, PROP_NONE);