Commit: 2b6253175ea63e787cde8bb3c6b7fa16c17e9247 Author: Ines Almeida Date: Thu Oct 25 13:41:32 2018 +0000 Branches: blender2.8 https://developer.blender.org/rB2b6253175ea63e787cde8bb3c6b7fa16c17e9247
Cleanup: comments and unused code =================================================================== M release/scripts/addons M release/scripts/addons_contrib M source/blender/editors/include/UI_icons.h M source/blender/editors/interface/interface.c M source/tools =================================================================== diff --git a/release/scripts/addons b/release/scripts/addons index 5f7fba0565a..2e14c2aa697 160000 --- a/release/scripts/addons +++ b/release/scripts/addons @@ -1 +1 @@ -Subproject commit 5f7fba0565a7c9ae93eae31a08fc9bbbd16d333a +Subproject commit 2e14c2aa69726b472f8758f62ad839eddaf63bfe diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib index fecc0db5600..311b03bd2ce 160000 --- a/release/scripts/addons_contrib +++ b/release/scripts/addons_contrib @@ -1 +1 @@ -Subproject commit fecc0db5600405a0c14c70120ae279222861ef80 +Subproject commit 311b03bd2ce4c5b3c3fc5e2b58a4ee1a629ea6a9 diff --git a/source/blender/editors/include/UI_icons.h b/source/blender/editors/include/UI_icons.h index b45392a7f87..c005d6dcc07 100644 --- a/source/blender/editors/include/UI_icons.h +++ b/source/blender/editors/include/UI_icons.h @@ -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) diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 1916023ab07..3e8d32c0e2b 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -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; diff --git a/source/tools b/source/tools index 11656ebaf7f..5162393c104 160000 --- a/source/tools +++ b/source/tools @@ -1 +1 @@ -Subproject commit 11656ebaf7f912cdb1b5eb39c5d0a3b5d492c1aa +Subproject commit 5162393c104d6d5f0314183a084875fff68f28bb _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs