Merge branch 'blender-v2.83-release'

This commit is contained in:
Campbell Barton 2020-04-20 11:58:15 +10:00
commit b293517d7b
1 changed files with 1 additions and 1 deletions

View File

@ -1282,7 +1282,7 @@ static void ui_multibut_states_create(uiBut *but_active, uiHandleButtonData *dat
* note: if we mix buttons which are proportional and others which are not,
* this may work a bit strangely */
if ((but_active->rnaprop && (RNA_property_flag(but_active->rnaprop) & PROP_PROPORTIONAL)) ||
ELEM(but_active->unit_type, PROP_UNIT_LENGTH)) {
ELEM(but_active->unit_type, RNA_SUBTYPE_UNIT_VALUE(PROP_UNIT_LENGTH))) {
if (data->origvalue != 0.0) {
data->multi_data.is_proportional = true;
}