kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix for error in recent commit, wasn't masking out the non unit subtype flags.

Browse Source
This commit is contained in:
Campbell Barton 2010-12-10 13:15:11 +00:00
parent f610c9b8a2
commit 5854cfa5b8
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1261,9 +1261,10 @@ int ui_is_but_unit(uiBut *but)
return 0;
if (scene->unit.system == USER_UNIT_NONE) {
if (unit_type != PROP_UNIT_ROTATION)
if (unit_type != PROP_UNIT_ROTATION) {
return 0;
}
}
return 1;
}
@ -3181,7 +3182,7 @@ void uiButSetUnitType(uiBut *but, const int unit_type)
int uiButGetUnitType(uiBut *but)
{
if(but->rnaprop) {
return RNA_property_subtype(but->rnaprop);
return RNA_SUBTYPE_UNIT(RNA_property_subtype(but->rnaprop));
}
else {
return ((int)but->unit_type)<<16;