diff options
author | Jean-Luc Peurière <jlp@nerim.net> | 2008-03-13 18:40:24 +0300 |
---|---|---|
committer | Jean-Luc Peurière <jlp@nerim.net> | 2008-03-13 18:40:24 +0300 |
commit | 526d0bec4722900a86d81ff0f5d71504b2b4ad8c (patch) | |
tree | 726fc6e9434695b358d3b9e15eb51526fffe6d67 /source/blender/include | |
parent | 09bb791249da886521759ead88b9b36673f6968f (diff) |
final (??) work on NDOF branch
it is now in a state where it can be safely
merged with trunk.
Note: basic icons were provided but I'm not
an icondesigner and working in a 16x15 grid
is way too small for me, so feel free to
change them.
Diffstat (limited to 'source/blender/include')
-rw-r--r-- | source/blender/include/BIF_resources.h | 8 | ||||
-rw-r--r-- | source/blender/include/blendef.h | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/include/BIF_resources.h b/source/blender/include/BIF_resources.h index cfa58321172..7f3b27fcf2f 100644 --- a/source/blender/include/BIF_resources.h +++ b/source/blender/include/BIF_resources.h @@ -58,10 +58,10 @@ typedef enum { ICON_SPACE4, ICON_TRIA_LEFT, ICON_TRIA_UP, - ICON_BLANK3, - ICON_BLANK4, - ICON_BLANK5, - ICON_BLANK6, + ICON_NDOF_TURN, + ICON_NDOF_FLY, + ICON_NDOF_TRANS, + ICON_NDOF_DOM, ICON_ORTHO, ICON_PERSP, diff --git a/source/blender/include/blendef.h b/source/blender/include/blendef.h index 44833b66576..e2d4d0c67ad 100644 --- a/source/blender/include/blendef.h +++ b/source/blender/include/blendef.h @@ -232,6 +232,7 @@ #define B_MAN_SCALE 163 #define B_HEMESHBROWSE 164 #define B_HEMESHLOCAL 165 +#define B_NDOF 166 /* IPO: 200 */ #define B_IPOHOME 201 |