griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'blender-v3.6-release'

Browse Source
This commit is contained in:
Campbell Barton
2023-05-29 10:04:55 +10:00
parent ab73a8abba 19a9941816
commit db43b27227
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/editors/interface/interface_handlers.cc
View File

@@ -5087,14 +5087,13 @@ static bool ui_numedit_but_NUM(uiButNumber *but,
break;
}
case PROP_SCALE_LOG: {
const float startvalue = max_ff(float(data->startvalue), log_min);
if (tempf < log_min) {
data->dragstartx -= logf(log_min / float(data->startvalue)) / fac -
float(mx - data->dragstartx);
data->dragstartx -= logf(log_min / startvalue) / fac - float(mx - data->dragstartx);
tempf = softmin;
}
else if (tempf > softmax) {
data->dragstartx -= logf(softmax / float(data->startvalue)) / fac -
float(mx - data->dragstartx);
data->dragstartx -= logf(softmax / startvalue) / fac - float(mx - data->dragstartx);
tempf = softmax;
}
break;
@@ -5494,9 +5493,13 @@ static int ui_do_but_NUM(
double value_step;
if (scale_type == PROP_SCALE_LOG) {
value_step = powf(10.0f,
(roundf(log10f(data->value) + UI_PROP_SCALE_LOG_SNAP_OFFSET) - 1.0f) +
log10f(number_but->step_size));
double precision = (roundf(log10f(data->value) + UI_PROP_SCALE_LOG_SNAP_OFFSET) - 1.0f) +
log10f(number_but->step_size);
/* Non-finite when `data->value` is zero. */
if (UNLIKELY(!isfinite(precision))) {
precision = -FLT_MAX; /* Ignore this value. */
}
value_step = powf(10.0f, max_ff(precision, -number_but->precision));
}
else {
value_step = double(number_but->step_size * UI_PRECISION_FLOAT_SCALE);