forked from bartvdbraak/blender
Fix: Auto Merge icon state were wrongly swapped
This commit is contained in:
parent
f05b9dba26
commit
12c9a9131f
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -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)
|
||||
|
@ -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);
|
||||
|
Loading…
Reference in New Issue
Block a user