diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-08-02 16:16:06 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-02 16:16:06 +0400 |
| commit | 4e8e502c0267faa68ce686df51cfb061d73ae93e (patch) | |
| tree | bf68517c1b537247b52b34d206cc640dc7280b31 /source/blender/editors/interface/resources.c | |
| parent | f5cff8ad37edbb46f155e768a07ff6785938f1b9 (diff) | |
| parent | de0db6c8daaf4f6276b43bd4c78d623fdb0eafb9 (diff) | |
Merging trunk up to r38932.
Diffstat (limited to 'source/blender/editors/interface/resources.c')
| -rw-r--r-- | source/blender/editors/interface/resources.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/source/blender/editors/interface/resources.c b/source/blender/editors/interface/resources.c index 1aa2fb391db..adabfe5f230 100644 --- a/source/blender/editors/interface/resources.c +++ b/source/blender/editors/interface/resources.c @@ -1,6 +1,3 @@ -/** \file blender/editors/interface/resources.c - * \ingroup edinterface - */ /* * $Id$ * @@ -33,6 +30,10 @@ * ***** END GPL/BL DUAL LICENSE BLOCK ***** */ +/** \file blender/editors/interface/resources.c + * \ingroup edinterface + */ + #include <math.h> #include <stdlib.h> #include <string.h> @@ -1587,6 +1588,12 @@ void init_userdef_do_versions(void) if (U.anisotropic_filter <= 0) U.anisotropic_filter = 1; + if (U.ndof_sensitivity == 0.0f) { + U.ndof_sensitivity = 1.0f; + U.ndof_flag = NDOF_LOCK_HORIZON | + NDOF_SHOULD_PAN | NDOF_SHOULD_ZOOM | NDOF_SHOULD_ROTATE; + } + /* funny name, but it is GE stuff, moves userdef stuff to engine */ // XXX space_set_commmandline_options(); /* this timer uses U */ |