diff options
author | Andrew Buttery <axb2035@gmail.com> | 2014-01-16 09:47:12 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2014-01-16 09:47:12 +0400 |
commit | d7c46c5d16c24e431c504148706ee3b5c68a2fd7 (patch) | |
tree | 66aa9bb0935a2173874b2c27bdec2a48d0e4711a /source/blender/editors | |
parent | 95acd3b20a494d083ae2a3d5afa25d5bdf310ac8 (diff) |
User Prefs: Manipulator unit and tooltip fixes
removal of x5 hardcoded size multiplier
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/interface/resources.c | 8 | ||||
-rw-r--r-- | source/blender/editors/transform/transform_manipulator.c | 2 |
2 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index f19a10ae355..d4166009191 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -1468,7 +1468,7 @@ void init_userdef_do_versions(void) /* transform widget settings */ if (U.tw_hotspot == 0) { U.tw_hotspot = 14; - U.tw_size = 20; /* percentage of window size */ + U.tw_size = 25; /* percentage of window size */ U.tw_handlesize = 16; /* percentage of widget radius */ } if (U.pad_rot_angle == 0) @@ -2337,7 +2337,11 @@ void init_userdef_do_versions(void) rgba_char_args_test_set(btheme->tinfo.info_debug_text, 0, 0, 0, 255); } } - + + if (!MAIN_VERSION_ATLEAST(bmain, 269, 9)) { + U.tw_size = U.tw_size * 5.0f; + } + if (U.versionfile < 270) { /* grease pencil - new layer color */ if (U.gpencil_new_layer_col[3] < 0.1f) { diff --git a/source/blender/editors/transform/transform_manipulator.c b/source/blender/editors/transform/transform_manipulator.c index 5ac97ed4e26..a2edb2dc5fc 100644 --- a/source/blender/editors/transform/transform_manipulator.c +++ b/source/blender/editors/transform/transform_manipulator.c @@ -1640,7 +1640,7 @@ void BIF_draw_manipulator(const bContext *C) break; } - mul_mat3_m4_fl(rv3d->twmat, ED_view3d_pixel_size(rv3d, rv3d->twmat[3]) * U.tw_size * 5.0f); + mul_mat3_m4_fl(rv3d->twmat, ED_view3d_pixel_size(rv3d, rv3d->twmat[3]) * U.tw_size); } /* when looking through a selected camera, the manipulator can be at the |