tmaq
/
tornavis
1
0
Fork 0
Code Issues 2 Pull Requests 29 Packages Projects 24 Releases Wiki Activity

code cleanup: replace (val >> 16) with macro RNA_SUBTYPE_UNIT_VALUE(val)

This commit is contained in:
Campbell Barton 2012-04-10 09:03:45 +00:00
parent c4ce26c906
commit e03ebf7a41
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1588,7 +1588,7 @@ void ui_convert_to_unit_alt_name(uiBut *but, char *str, size_t maxlen)
orig_str = MEM_callocN(sizeof(char) * maxlen + 1, "textedit sub str");
memcpy(orig_str, str, maxlen);
bUnit_ToUnitAltName(str, maxlen, orig_str, unit->system, unit_type >> 16);
bUnit_ToUnitAltName(str, maxlen, orig_str, unit->system, RNA_SUBTYPE_UNIT_VALUE(unit_type));
MEM_freeN(orig_str);
}
@ -1607,12 +1607,13 @@ static void ui_get_but_string_unit(uiBut *but, char *str, int len_max, double va
if (precision > PRECISION_FLOAT_MAX) precision = PRECISION_FLOAT_MAX;
else if (precision == 0) precision = 2;
bUnit_AsString(str, len_max, ui_get_but_scale_unit(but, value), precision, unit->system, unit_type >> 16, do_split, pad);
bUnit_AsString(str, len_max, ui_get_but_scale_unit(but, value), precision,
unit->system, RNA_SUBTYPE_UNIT_VALUE(unit_type), do_split, pad);
}
static float ui_get_but_step_unit(uiBut *but, float step_default)
{
int unit_type = uiButGetUnitType(but) >> 16;
int unit_type = RNA_SUBTYPE_UNIT_VALUE(uiButGetUnitType(but));
float step;
step = bUnit_ClosestScalar(ui_get_but_scale_unit(but, step_default), but->block->unit->system, unit_type);
@ -1707,8 +1708,10 @@ static int ui_set_but_string_eval_num_unit(bContext *C, uiBut *but, const char *
BLI_strncpy(str_unit_convert, str, sizeof(str_unit_convert));
/* ugly, use the draw string to get the value, this could cause problems if it includes some text which resolves to a unit */
bUnit_ReplaceString(str_unit_convert, sizeof(str_unit_convert), but->drawstr, ui_get_but_scale_unit(but, 1.0), but->block->unit->system, unit_type >> 16);
/* ugly, use the draw string to get the value,
* this could cause problems if it includes some text which resolves to a unit */
bUnit_ReplaceString(str_unit_convert, sizeof(str_unit_convert), but->drawstr,
ui_get_but_scale_unit(but, 1.0), but->block->unit->system, RNA_SUBTYPE_UNIT_VALUE(unit_type));
return (BPY_button_exec(C, str_unit_convert, value, TRUE) != -1);
}
@ -3388,7 +3391,7 @@ PointerRNA *uiButGetOperatorPtrRNA(uiBut *but)
void uiButSetUnitType(uiBut *but, const int unit_type)
{
but->unit_type = (unsigned char)(unit_type >> 16);
but->unit_type = (unsigned char)(RNA_SUBTYPE_UNIT_VALUE(unit_type));
}
int uiButGetUnitType(uiBut *but)

2
source/blender/editors/interface/interface_handlers.c
View File

@ -2294,7 +2294,7 @@ static float ui_numedit_apply_snapf(uiBut *but, float tempf, float softmin, floa
if (ui_is_but_unit(but)) {
UnitSettings *unit = but->block->unit;
int unit_type = uiButGetUnitType(but) >> 16;
int unit_type = RNA_SUBTYPE_UNIT_VALUE(uiButGetUnitType(but));
if (bUnit_IsValid(unit->system, unit_type)) {
fac = (float)bUnit_BaseScalar(unit->system, unit_type);

6
source/blender/makesrna/RNA_types.h
View File

@ -91,9 +91,9 @@ typedef enum PropertyUnit {
PROP_UNIT_ACCELERATION = (8<<16) /* m/(s^2) */
} PropertyUnit;
#define RNA_SUBTYPE_UNIT(subtype) ((subtype) & 0x00FF0000)
#define RNA_SUBTYPE_VALUE(subtype) ((subtype) & ~0x00FF0000)
#define RNA_SUBTYPE_UNIT_VALUE(subtype) ((subtype)>>16)
#define RNA_SUBTYPE_UNIT(subtype) ((subtype) & 0x00FF0000)
#define RNA_SUBTYPE_VALUE(subtype) ((subtype) & ~0x00FF0000)
#define RNA_SUBTYPE_UNIT_VALUE(subtype) ((subtype) >> 16)
#define RNA_ENUM_BITFLAG_SIZE 32