diff options
| author | William Reynish <billrey@me.com> | 2019-05-22 15:21:31 +0300 |
|---|---|---|
| committer | William Reynish <billrey@me.com> | 2019-05-22 15:21:31 +0300 |
| commit | 12c9a9131fd9a6ea8ae060a6914b33a3c7ac5468 (patch) | |
| tree | 460e160960126500430dab3973f6705a91544313 | |
| parent | f05b9dba26607c319fa2246ec915490f10ca86e6 (diff) | |
Fix: Auto Merge icon state were wrongly swapped
| -rw-r--r-- | release/datafiles/blender_icons16/icon16_automerge_off.dat | bin | 1048 -> 1048 bytes | |||
| -rw-r--r-- | release/datafiles/blender_icons16/icon16_automerge_on.dat | bin | 1048 -> 1048 bytes | |||
| -rw-r--r-- | release/datafiles/blender_icons32/icon32_automerge_off.dat | bin | 4120 -> 4120 bytes | |||
| -rw-r--r-- | release/datafiles/blender_icons32/icon32_automerge_on.dat | bin | 4120 -> 4120 bytes | |||
| -rw-r--r-- | source/blender/editors/include/UI_icons.h | 2 | ||||
| -rw-r--r-- | source/blender/makesrna/intern/rna_scene.c | 2 |
6 files changed, 2 insertions, 2 deletions
diff --git a/release/datafiles/blender_icons16/icon16_automerge_off.dat b/release/datafiles/blender_icons16/icon16_automerge_off.dat Binary files differindex b98eecbb778..9c7e7bd4dd9 100644 --- a/release/datafiles/blender_icons16/icon16_automerge_off.dat +++ b/release/datafiles/blender_icons16/icon16_automerge_off.dat diff --git a/release/datafiles/blender_icons16/icon16_automerge_on.dat b/release/datafiles/blender_icons16/icon16_automerge_on.dat Binary files differindex 9c7e7bd4dd9..b98eecbb778 100644 --- a/release/datafiles/blender_icons16/icon16_automerge_on.dat +++ b/release/datafiles/blender_icons16/icon16_automerge_on.dat diff --git a/release/datafiles/blender_icons32/icon32_automerge_off.dat b/release/datafiles/blender_icons32/icon32_automerge_off.dat Binary files differindex d2f0737d851..4025adfb80d 100644 --- a/release/datafiles/blender_icons32/icon32_automerge_off.dat +++ b/release/datafiles/blender_icons32/icon32_automerge_off.dat diff --git a/release/datafiles/blender_icons32/icon32_automerge_on.dat b/release/datafiles/blender_icons32/icon32_automerge_on.dat Binary files differindex 4025adfb80d..d2f0737d851 100644 --- a/release/datafiles/blender_icons32/icon32_automerge_on.dat +++ b/release/datafiles/blender_icons32/icon32_automerge_on.dat 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); |