diff options
author | Campbell Barton <ideasman42@gmail.com> | 2010-11-18 17:10:09 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2010-11-18 17:10:09 +0300 |
commit | 3ae670fc02f9e4eadf3c92f8c8c30df81e4aaaf2 (patch) | |
tree | 0cd56059e7a2d58e59aa93d82094566245b30b16 /source/blender/editors | |
parent | 4045e838dff87dc95f31d908c7ef4ab541bbe9f4 (diff) |
fix [#24786] Setting Rotation Units to Radians doesn't affect the UI [33146]
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/animation/anim_draw.c | 2 | ||||
-rw-r--r-- | source/blender/editors/interface/interface.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/animation/anim_draw.c b/source/blender/editors/animation/anim_draw.c index 7cfe180a7bf..dd27de883b3 100644 --- a/source/blender/editors/animation/anim_draw.c +++ b/source/blender/editors/animation/anim_draw.c @@ -392,7 +392,7 @@ float ANIM_unit_mapping_get_factor (Scene *scene, ID *id, FCurve *fcu, short res if (RNA_SUBTYPE_UNIT(RNA_property_subtype(prop)) == PROP_UNIT_ROTATION) { /* if the radians flag is not set, default to using degrees which need conversions */ - if ((scene) && (scene->unit.flag & USER_UNIT_ROT_RADIANS) == 0) { + if ((scene) && (scene->unit.system_rotation == USER_UNIT_ROT_RADIANS) == 0) { if (restore) return M_PI / 180.0f; /* degrees to radians */ else diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 7120440468c..85c9feaf823 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -1252,8 +1252,8 @@ int ui_is_but_unit(uiBut *but) unit_type = RNA_SUBTYPE_UNIT(RNA_property_subtype(but->rnaprop)); -#if 0 // removed so angle buttons get correct snapping - if (scene->unit.flag & USER_UNIT_ROT_RADIANS && unit_type == PROP_UNIT_ROTATION) +#if 1 // removed so angle buttons get correct snapping + if (scene->unit.system_rotation == USER_UNIT_ROT_RADIANS && unit_type == PROP_UNIT_ROTATION) return 0; #endif |