archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Manipulator: de-duplicate flags and scale option

Browse Source
This commit is contained in:
Campbell Barton
2017-06-19 17:47:04 +10:00
parent 2ecb9856bc
commit 7b14065729
17 changed files with 46 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/editors/interface/resources.c
View File

@@ -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_size == 0) {
U.manipulator_size = 75;
U.manipulator_flag |= USER_MANIPULATOR_DRAW;
}
if (U.manipulator_scale == 0)
U.manipulator_scale = 75;
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) {