blender
/
blender
129
398
Fork 572
Code Issues 6.2k Pull Requests 746 Projects 19 Wiki Activity

Fix: Auto Merge icon state were wrongly swapped

This commit is contained in:
William Reynish 2019-05-22 14:21:31 +02:00
parent f05b9dba26
commit 12c9a9131f
6 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
release/datafiles/blender_icons16/icon16_automerge_off.dat
View File

Binary file not shown.

BIN
release/datafiles/blender_icons16/icon16_automerge_on.dat
View File

Binary file not shown.

BIN
release/datafiles/blender_icons32/icon32_automerge_off.dat
View File

Binary file not shown.

BIN
release/datafiles/blender_icons32/icon32_automerge_on.dat
View File

Binary file not shown.

2
source/blender/editors/include/UI_icons.h
View 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)

2
source/blender/makesrna/intern/rna_scene.c
View 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);