Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2017-06-19 10:47:04 +0300
committerCampbell Barton <ideasman42@gmail.com>2017-06-19 10:52:26 +0300
commit7b14065729af4266bffbf70ef0de3bd646ec555c (patch)
treebbb13136b933e369227cea9f1baafdc455a93806 /source/blender/editors/interface/resources.c
parent2ecb9856bc3a77354c9785a7119a0904d11e0d8c (diff)
Manipulator: de-duplicate flags and scale option
Diffstat (limited to 'source/blender/editors/interface/resources.c')
-rw-r--r--source/blender/editors/interface/resources.c15
1 files changed, 4 insertions, 11 deletions
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c
index 09ec08fe265..cf35f4d895b 100644
--- a/source/blender/editors/interface/resources.c
+++ b/source/blender/editors/interface/resources.c
@@ -1798,14 +1798,10 @@ void init_userdef_do_versions(void)
U.savetime = 1;
// XXX error(STRINGIFY(BLENDER_STARTUP_FILE)" is buggy, please consider removing it.\n");
}
- /* transform widget settings */
- if (U.tw_hotspot == 0) {
- U.tw_hotspot = 14;
- U.tw_size = 25; /* percentage of window size */
- U.tw_handlesize = 16; /* percentage of widget radius */
- }
- if (U.manipulator_scale == 0)
- U.manipulator_scale = 75;
+ if (U.manipulator_size == 0) {
+ U.manipulator_size = 75;
+ U.manipulator_flag |= USER_MANIPULATOR_DRAW;
+ }
if (U.pad_rot_angle == 0.0f)
U.pad_rot_angle = 15.0f;
@@ -2642,9 +2638,6 @@ void init_userdef_do_versions(void)
if (!USER_VERSION_ATLEAST(269, 9)) {
bTheme *btheme;
-
- U.tw_size = U.tw_size * 5.0f;
-
/* Action Editor (and NLA Editor) - Keyframe Colors */
/* Graph Editor - larger vertex size defaults */
for (btheme = U.themes.first; btheme; btheme = btheme->next) {