Fix: Auto Merge icon state were wrongly swapped
authorWilliam Reynish <billrey@me.com>
Wed, 22 May 2019 12:21:31 +0000 (14:21 +0200)
committerWilliam Reynish <billrey@me.com>
Wed, 22 May 2019 12:21:31 +0000 (14:21 +0200)
release/datafiles/blender_icons16/icon16_automerge_off.dat
release/datafiles/blender_icons16/icon16_automerge_on.dat
release/datafiles/blender_icons32/icon32_automerge_off.dat
release/datafiles/blender_icons32/icon32_automerge_on.dat
source/blender/editors/include/UI_icons.h
source/blender/makesrna/intern/rna_scene.c

index b98eecb..9c7e7bd 100644 (file)
Binary files a/release/datafiles/blender_icons16/icon16_automerge_off.dat and b/release/datafiles/blender_icons16/icon16_automerge_off.dat differ
index 9c7e7bd..b98eecb 100644 (file)
Binary files a/release/datafiles/blender_icons16/icon16_automerge_on.dat and b/release/datafiles/blender_icons16/icon16_automerge_on.dat differ
index d2f0737..4025adf 100644 (file)
Binary files a/release/datafiles/blender_icons32/icon32_automerge_off.dat and b/release/datafiles/blender_icons32/icon32_automerge_off.dat differ
index 4025adf..d2f0737 100644 (file)
Binary files a/release/datafiles/blender_icons32/icon32_automerge_on.dat and b/release/datafiles/blender_icons32/icon32_automerge_on.dat differ
index 941eff9..048f30b 100644 (file)
@@ -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)
index 2a69ca7..894f9bf 100644 (file)
@@ -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);