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/src/ghostwinlay.c | |
| 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/src/ghostwinlay.c')
| -rw-r--r-- | source/blender/src/ghostwinlay.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/src/ghostwinlay.c b/source/blender/src/ghostwinlay.c index 907d0320b57..855699fa512 100644 --- a/source/blender/src/ghostwinlay.c +++ b/source/blender/src/ghostwinlay.c @@ -935,12 +935,14 @@ void window_open_ndof(Window* win) MEM_freeN(plug_path); if (ndofLib) { - GHOST_OpenNDOF(g_system, win->ghostwin, + G.ndofdevice = 0 - GHOST_OpenNDOF(g_system, win->ghostwin, PIL_dynlib_find_symbol(ndofLib, "ndofInit"), PIL_dynlib_find_symbol(ndofLib, "ndofShutdown"), PIL_dynlib_find_symbol(ndofLib, "ndofOpen")); + } else { GHOST_OpenNDOF(g_system, win->ghostwin, 0, 0, 0); + G.ndofdevice = -1; } } |