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

Cleanup: comments and unused code

This commit is contained in:
Inês Almeida 2018-10-25 13:41:32 +00:00
parent 869b1a8d6e
commit 2b6253175e
5 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/scripts/addons

@ -1 +1 @@
Subproject commit 5f7fba0565a7c9ae93eae31a08fc9bbbd16d333a
Subproject commit 2e14c2aa69726b472f8758f62ad839eddaf63bfe

2
release/scripts/addons_contrib

@ -1 +1 @@
Subproject commit fecc0db5600405a0c14c70120ae279222861ef80
Subproject commit 311b03bd2ce4c5b3c3fc5e2b58a4ee1a629ea6a9

4
source/blender/editors/include/UI_icons.h
View File

@ -91,8 +91,8 @@ DEF_ICON_COLOR(COPY_ID)
DEF_ICON(EYEDROPPER)
DEF_ICON_COLOR(LINK_AREA)
DEF_ICON(AUTO)
DEF_ICON(CHECKBOX_DEHLT)
DEF_ICON(CHECKBOX_HLT)
DEF_ICON(CHECKBOX_DEHLT) /* de-Hilight - Checkbox OFF */
DEF_ICON(CHECKBOX_HLT) /* Hilight - Checkbox ON */
DEF_ICON(UNLOCKED)
DEF_ICON(LOCKED)
DEF_ICON(UNPINNED)

4
source/blender/editors/interface/interface.c
View File

@ -2951,7 +2951,6 @@ void ui_but_update_ex(uiBut *but, const bool validate)
{
/* if something changed in the button */
double value = UI_BUT_VALUE_UNSET;
// float okwidth; // UNUSED
ui_but_update_select_flag(but, &value);
@ -2987,8 +2986,7 @@ void ui_but_update_ex(uiBut *but, const bool validate)
case UI_BTYPE_ICON_TOGGLE:
case UI_BTYPE_ICON_TOGGLE_N:
if (!but->rnaprop || (RNA_property_flag(but->rnaprop) & PROP_ICONS_CONSECUTIVE)) {
if (but->flag & UI_SELECT) but->iconadd = 1;
else but->iconadd = 0;
but->iconadd = (but->flag & UI_SELECT) ? 1 : 0;
}
break;

2
source/tools

@ -1 +1 @@
Subproject commit 11656ebaf7f912cdb1b5eb39c5d0a3b5d492c1aa
Subproject commit 5162393c104d6d5f0314183a084875fff68f28bb