[Bf-committers] NDOF compile error on windows

[Ettore Pasquini]

I noticed the following error after a svn update on Windows:

1>Compiling...
1>GHOST_SystemWin32.cpp
1>..\..\intern\GHOST_SystemWin32.cpp(858) : error C2046: illegal case
1>..\..\intern\GHOST_SystemWin32.cpp(868) : error C2043: illegal break

The "case WM_BLND_3DX:" is clearly in the wrong place but I am positive my
Windows patch put it in the correct place.

The fix is straightforward, but anyway, here goes another one:

http://cubelogic.org/blender/ghost_ndof_fix_win.patch

Ettore


Index: intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- intern/ghost/intern/GHOST_SystemWin32.cpp    (revision 11259)
+++ intern/ghost/intern/GHOST_SystemWin32.cpp    (working copy)
@@ -843,6 +843,17 @@
                      * In GHOST, we let DefWindowProc call the timer
callback.
                      */
                     break;
+                case WM_BLND_3DX:
+                    {
+                        GHOST_TEventNDOFData ndofdata;
+                  
system->m_ndofManager->GHOST_NDOFGetDatas(ndofdata);
+                        system->m_eventManager->
+                            pushEvent(new GHOST_EventNDOF(
+                                system->getMilliSeconds(),
+                                GHOST_kEventNDOFMotion,
+                                window, ndofdata));
+                    }
+                    break;
             }
         }
         else {
@@ -855,17 +866,6 @@
                WM_CREATE            0x01
                We let DefWindowProc do the work.
             */
-                case WM_BLND_3DX:
-                    {
-                        GHOST_TEventNDOFData ndofdata;
-                  
system->m_ndofManager->GHOST_NDOFGetDatas(ndofdata);
-                        system->m_eventManager->
-                            pushEvent(new GHOST_EventNDOF(
-                                system->getMilliSeconds(),
-                                GHOST_kEventNDOFMotion,
-                                window, ndofdata));
-                    }
-                    break;
         }
     }
     else {