diff options
| author | Julian Eisel <julian@blender.org> | 2022-11-10 15:17:42 +0300 |
|---|---|---|
| committer | Julian Eisel <julian@blender.org> | 2022-11-10 15:17:42 +0300 |
| commit | 7246c387435769a169ac24c91434c615df6434b4 (patch) | |
| tree | 61842e3e0ce85e80720fdd7476d44d2e629f59fd /source/blender/editors/interface/interface_utils.cc | |
| parent | c5f55d17096d373791363e46004176e3f7f7ae52 (diff) | |
| parent | 0b4bd3ddc016298e868169a541cf6c132b10c587 (diff) | |
Merge branch 'master' into asset-browser-grid-viewasset-browser-grid-view
Diffstat (limited to 'source/blender/editors/interface/interface_utils.cc')
| -rw-r--r-- | source/blender/editors/interface/interface_utils.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_utils.cc b/source/blender/editors/interface/interface_utils.cc index 4b94834ce97..423eefce3f3 100644 --- a/source/blender/editors/interface/interface_utils.cc +++ b/source/blender/editors/interface/interface_utils.cc @@ -435,7 +435,7 @@ eAutoPropButsReturn uiDefAutoButsRNA(uiLayout *layout, /* Only buttons that can be edited as text. */ const bool use_activate_init = ((prop == prop_activate_init) && - (ELEM(type, PROP_STRING, PROP_INT, PROP_FLOAT))); + ELEM(type, PROP_STRING, PROP_INT, PROP_FLOAT)); if (use_activate_init) { uiLayoutSetActivateInit(col, true); @@ -495,7 +495,7 @@ static bool add_collection_search_item(CollItemSearch *cis, cis->name, cis->data, cis->iconid, - cis->has_sep_char ? (int)UI_BUT_HAS_SEP_CHAR : 0, + cis->has_sep_char ? int(UI_BUT_HAS_SEP_CHAR) : 0, name_prefix_offset); } @@ -787,7 +787,7 @@ int UI_calc_float_precision(int prec, double value) */ value = fabs(value); if ((value < pow10_neg[prec]) && (value > (1.0 / max_pow))) { - int value_i = (int)lround(value * max_pow); + int value_i = int(lround(value * max_pow)); if (value_i != 0) { const int prec_span = 3; /* show: 0.01001, 5 would allow 0.0100001 for eg. */ int test_prec; |