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/editors/include/UI_icons.h
parentf05b9dba26607c319fa2246ec915490f10ca86e6 (diff)
Fix: Auto Merge icon state were wrongly swapped
Diffstat (limited to 'source/blender/editors/include/UI_icons.h')
-rw-r--r--source/blender/editors/include/UI_icons.h2
1 files changed, 1 insertions, 1 deletions
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)