[Bf-blender-cvs] [12c9a9131fd] master: Fix: Auto Merge icon state were wrongly swapped

[William Reynish]

Commit: 12c9a9131fd9a6ea8ae060a6914b33a3c7ac5468
Author: William Reynish
Date:   Wed May 22 14:21:31 2019 +0200
Branches: master
https://developer.blender.org/rB12c9a9131fd9a6ea8ae060a6914b33a3c7ac5468

Fix: Auto Merge icon state were wrongly swapped

===================================================================

M	release/datafiles/blender_icons16/icon16_automerge_off.dat
M	release/datafiles/blender_icons16/icon16_automerge_on.dat
M	release/datafiles/blender_icons32/icon32_automerge_off.dat
M	release/datafiles/blender_icons32/icon32_automerge_on.dat
M	source/blender/editors/include/UI_icons.h
M	source/blender/makesrna/intern/rna_scene.c

===================================================================

diff --git a/release/datafiles/blender_icons16/icon16_automerge_off.dat b/release/datafiles/blender_icons16/icon16_automerge_off.dat
index b98eecbb778..9c7e7bd4dd9 100644
Binary files a/release/datafiles/blender_icons16/icon16_automerge_off.dat and b/release/datafiles/blender_icons16/icon16_automerge_off.dat differ
diff --git a/release/datafiles/blender_icons16/icon16_automerge_on.dat b/release/datafiles/blender_icons16/icon16_automerge_on.dat
index 9c7e7bd4dd9..b98eecbb778 100644
Binary files a/release/datafiles/blender_icons16/icon16_automerge_on.dat and b/release/datafiles/blender_icons16/icon16_automerge_on.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_automerge_off.dat b/release/datafiles/blender_icons32/icon32_automerge_off.dat
index d2f0737d851..4025adfb80d 100644
Binary files a/release/datafiles/blender_icons32/icon32_automerge_off.dat and b/release/datafiles/blender_icons32/icon32_automerge_off.dat differ
diff --git a/release/datafiles/blender_icons32/icon32_automerge_on.dat b/release/datafiles/blender_icons32/icon32_automerge_on.dat
index 4025adfb80d..d2f0737d851 100644
Binary files a/release/datafiles/blender_icons32/icon32_automerge_on.dat and b/release/datafiles/blender_icons32/icon32_automerge_on.dat differ
diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h
index 941eff9d3bd..048f30bdf26 100644
--- a/source/blender/editors/include/UI_icons.h
+++ b/source/blender/editors/include/UI_icons.h
@@ -699,8 +699,8 @@ DEF_ICON(VIS_SEL_10)
 DEF_ICON(VIS_SEL_01)
 DEF_ICON(VIS_SEL_00)
 DEF_ICON_BLANK(231)
-DEF_ICON(AUTOMERGE_ON)
 DEF_ICON(AUTOMERGE_OFF)
+DEF_ICON(AUTOMERGE_ON)
 DEF_ICON_BLANK(234)
 DEF_ICON(UV_VERTEXSEL)
 DEF_ICON(UV_EDGESEL)
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);