diff options
author | Joerg Mueller <nexyon@gmail.com> | 2011-08-03 16:44:52 +0400 |
---|---|---|
committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-03 16:44:52 +0400 |
commit | eb9d591898e93dbbe9e28865018175b9da730596 (patch) | |
tree | 3209caefe505273e834a936e54f6146a4185e83b /source/blender/makesdna/DNA_userdef_types.h | |
parent | 6d7490632f13f9744c6b3e507c838a34f3481846 (diff) | |
parent | f1fb54e126824ff38b8bf26fa80f3f46c886bd45 (diff) |
* Merging trunk up to r38981.
* Fixing a minor issue in a previous commit.
Diffstat (limited to 'source/blender/makesdna/DNA_userdef_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_userdef_types.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/blender/makesdna/DNA_userdef_types.h b/source/blender/makesdna/DNA_userdef_types.h index b5a1a36e126..85a64e02ddb 100644 --- a/source/blender/makesdna/DNA_userdef_types.h +++ b/source/blender/makesdna/DNA_userdef_types.h @@ -601,6 +601,9 @@ extern UserDef U; /* from blenkernel blender.c */ /* actually... users probably don't care about what the mode is called, just that it feels right */ #define NDOF_ORBIT_INVERT_AXES (1 << 6) +/* zoom is up/down if this flag is set (otherwise forward/backward) */ +#define NDOF_ZOOM_UPDOWN (1 << 7) +#define NDOF_INVERT_ZOOM (1 << 8) #ifdef __cplusplus |