whitespace cleanup
authorCampbell Barton <ideasman42@gmail.com>
Sun, 25 Sep 2011 12:31:21 +0000 (12:31 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Sun, 25 Sep 2011 12:31:21 +0000 (12:31 +0000)
62 files changed:
CMakeLists.txt
intern/ghost/intern/GHOST_DropTargetWin32.h
intern/ghost/intern/GHOST_EventManager.h
intern/ghost/intern/GHOST_System.h
intern/ghost/intern/GHOST_SystemCarbon.cpp
intern/ghost/intern/GHOST_SystemX11.cpp
intern/ghost/intern/GHOST_SystemX11.h
intern/ghost/intern/GHOST_WindowCocoa.h
intern/ghost/intern/GHOST_WindowCocoa.mm
intern/ghost/intern/GHOST_WindowWin32.cpp
intern/ghost/intern/GHOST_WindowX11.cpp
intern/string/STR_HashedString.h
source/blender/blenkernel/intern/implicit.c
source/blender/blenkernel/intern/ipo.c
source/blender/blenkernel/intern/material.c
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/collada/AnimationImporter.cpp
source/blender/collada/MeshImporter.cpp
source/blender/editors/animation/anim_channels_edit.c
source/blender/editors/animation/keyframing.c
source/blender/editors/include/ED_anim_api.h
source/blender/editors/interface/view2d_ops.c
source/blender/editors/screen/area.c
source/blender/editors/sculpt_paint/paint_image.c
source/blender/editors/space_info/info_draw.c
source/blender/editors/space_outliner/outliner_draw.c
source/blender/editors/transform/transform.h
source/blender/editors/transform/transform_conversions.c
source/blender/gpu/intern/gpu_buffers.c
source/blender/gpu/intern/gpu_draw.c
source/blender/imbuf/intern/indexer.c
source/blender/makesdna/DNA_cloth_types.h
source/blender/makesdna/DNA_constraint_types.h
source/blender/makesdna/DNA_ipo_types.h
source/blender/makesdna/DNA_modifier_types.h
source/blender/makesdna/DNA_scene_types.h
source/blender/makesrna/intern/rna_userdef.c
source/blender/nodes/composite/nodes/node_composite_image.c
source/blender/nodes/intern/node_common.c
source/blender/render/intern/raytrace/rayobject.cpp
source/blender/render/intern/raytrace/rayobject_qbvh.cpp
source/blender/render/intern/raytrace/rayobject_svbvh.cpp
source/blender/render/intern/raytrace/rayobject_vbvh.cpp
source/blender/render/intern/source/convertblender.c
source/creator/creator.c
source/gameengine/Converter/BL_ArmatureChannel.cpp
source/gameengine/Converter/BL_BlenderDataConversion.cpp
source/gameengine/Expressions/KX_HashedPtr.cpp
source/gameengine/Expressions/ListValue.cpp
source/gameengine/Expressions/PyObjectPlus.h
source/gameengine/GameLogic/SCA_JoystickManager.cpp
source/gameengine/Ketsji/KX_CameraActuator.cpp
source/gameengine/Ketsji/KX_KetsjiEngine.cpp
source/gameengine/Ketsji/KX_MouseFocusSensor.h
source/gameengine/Ketsji/KX_NearSensor.cpp
source/gameengine/Ketsji/KX_ObjectActuator.h
source/gameengine/Ketsji/KX_ParentActuator.h
source/gameengine/Ketsji/KX_PythonSeq.cpp
source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
source/gameengine/Network/NG_NetworkMessage.h
source/gameengine/SceneGraph/SG_Node.cpp

index 2c0e069..b3a01bb 100644 (file)
@@ -1006,7 +1006,7 @@ elseif(APPLE)
        mark_as_advanced(SYSTEMSTUBS_LIBRARY)
        if(SYSTEMSTUBS_LIBRARY)
                set(PLATFORM_LINKLIBS stdc++ SystemStubs)
-       else()
+       else()
                set(PLATFORM_LINKLIBS stdc++)
        endif()
 
index 980e9f9..7179c29 100644 (file)
@@ -53,7 +53,7 @@ public:
        ULONG   __stdcall Release (void);
 
        /* IDropTarget implementation
-        + The IDropTarget interface is one of the interfaces you implement to 
+        + The IDropTarget interface is one of the interfaces you implement to
         provide drag-and-drop operations in your application. It contains methods 
         used in any application that can be a target for data during a 
         drag-and-drop operation. A drop-target application is responsible for:
index 9e68a13..3dc7515 100644 (file)
@@ -127,9 +127,9 @@ public:
         * Removes all events for a window from the stack.
         * @param       window  The window to remove events for.
         */
-               virtual void
-        removeWindowEvents(
-               GHOST_IWindow* window
+               virtual void
+       removeWindowEvents(
+               GHOST_IWindow* window
         );
 
        /**
index c1e7091..e5ec868 100644 (file)
@@ -250,7 +250,7 @@ public:
        virtual inline GHOST_WindowManager* getWindowManager() const;
 
 #ifdef WITH_INPUT_NDOF
-       /**
+       /**
         * Returns a pointer to our n-degree of freedeom manager.
         * @return A pointer to our n-degree of freedeom manager.
         */
index e02e569..02ff5c0 100644 (file)
@@ -394,7 +394,7 @@ GHOST_TUns8 GHOST_SystemCarbon::getNumDisplays() const
 void GHOST_SystemCarbon::getMainDisplayDimensions(GHOST_TUns32& width, GHOST_TUns32& height) const
 {
        BitMap screenBits;
-    Rect bnds = GetQDGlobalsScreenBits(&screenBits)->bounds;
+       Rect bnds = GetQDGlobalsScreenBits(&screenBits)->bounds;
        width = bnds.right - bnds.left;
        height = bnds.bottom - bnds.top;
 }
@@ -413,28 +413,28 @@ GHOST_IWindow* GHOST_SystemCarbon::createWindow(
        const GHOST_TEmbedderWindowID parentWindow
 )
 {
-    GHOST_IWindow* window = 0;
+       GHOST_IWindow* window = 0;
 
        window = new GHOST_WindowCarbon (title, left, top, width, height, state, type);
 
-    if (window) {
-        if (window->getValid()) {
-            // Store the pointer to the window 
-            GHOST_ASSERT(m_windowManager, "m_windowManager not initialized");
-            m_windowManager->addWindow(window);
-            m_windowManager->setActiveWindow(window);
-            pushEvent(new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowSize, window));
-        }
-        else {
+       if (window) {
+               if (window->getValid()) {
+                       // Store the pointer to the window
+                       GHOST_ASSERT(m_windowManager, "m_windowManager not initialized");
+                       m_windowManager->addWindow(window);
+                       m_windowManager->setActiveWindow(window);
+                       pushEvent(new GHOST_Event(getMilliSeconds(), GHOST_kEventWindowSize, window));
+               }
+               else {
                        GHOST_PRINT("GHOST_SystemCarbon::createWindow(): window invalid\n");
-            delete window;
-            window = 0;
-        }
-    }
+                       delete window;
+                       window = 0;
+               }
+       }
        else {
                GHOST_PRINT("GHOST_SystemCarbon::createWindow(): could not create window\n");
        }
-    return window;
+       return window;
 }
 
 GHOST_TSuccess GHOST_SystemCarbon::beginFullScreen(const GHOST_DisplaySetting& setting, GHOST_IWindow** window, const bool stereoVisual)
@@ -522,19 +522,19 @@ bool GHOST_SystemCarbon::processEvents(bool waitForEvent)
                }
        } while (waitForEvent && !anyProcessed);
        
-    return anyProcessed;
+       return anyProcessed;
 }
        
 
 GHOST_TSuccess GHOST_SystemCarbon::getCursorPosition(GHOST_TInt32& x, GHOST_TInt32& y) const
 {
-    Point mouseLoc;
-    // Get the position of the mouse in the active port
-    ::GetGlobalMouse(&mouseLoc);
-    // Convert the coordinates to screen coordinates
-    x = (GHOST_TInt32)mouseLoc.h;
-    y = (GHOST_TInt32)mouseLoc.v;
-    return GHOST_kSuccess;
+       Point mouseLoc;
+       // Get the position of the mouse in the active port
+       ::GetGlobalMouse(&mouseLoc);
+       // Convert the coordinates to screen coordinates
+       x = (GHOST_TInt32)mouseLoc.h;
+       y = (GHOST_TInt32)mouseLoc.v;
+       return GHOST_kSuccess;
 }
 
 
@@ -552,29 +552,29 @@ GHOST_TSuccess GHOST_SystemCarbon::setCursorPosition(GHOST_TInt32 x, GHOST_TInt3
        // this call below sends event, but empties other events (like shift)
        // CGPostMouseEvent(CGPointMake(xf, yf), TRUE, 1, FALSE, 0);
 
-    return GHOST_kSuccess;
+       return GHOST_kSuccess;
 }
 
 
 GHOST_TSuccess GHOST_SystemCarbon::getModifierKeys(GHOST_ModifierKeys& keys) const
 {
-    UInt32 modifiers = ::GetCurrentKeyModifiers();
+       UInt32 modifiers = ::GetCurrentKeyModifiers();
 
-    keys.set(GHOST_kModifierKeyOS, (modifiers & cmdKey) ? true : false);
-    keys.set(GHOST_kModifierKeyLeftAlt, (modifiers & optionKey) ? true : false);
-    keys.set(GHOST_kModifierKeyLeftShift, (modifiers & shiftKey) ? true : false);
-    keys.set(GHOST_kModifierKeyLeftControl, (modifiers & controlKey) ? true : false);
+       keys.set(GHOST_kModifierKeyOS, (modifiers & cmdKey) ? true : false);
+       keys.set(GHOST_kModifierKeyLeftAlt, (modifiers & optionKey) ? true : false);
+       keys.set(GHOST_kModifierKeyLeftShift, (modifiers & shiftKey) ? true : false);
+       keys.set(GHOST_kModifierKeyLeftControl, (modifiers & controlKey) ? true : false);
        
-    return GHOST_kSuccess;
+       return GHOST_kSuccess;
 }
 
-       /* XXX, incorrect for multibutton mice */
+/* XXX, incorrect for multibutton mice */
 GHOST_TSuccess GHOST_SystemCarbon::getButtons(GHOST_Buttons& buttons) const
 {
-    Boolean theOnlyButtonIsDown = ::Button();
-    buttons.clear();
-    buttons.set(GHOST_kButtonMaskLeft, theOnlyButtonIsDown);
-    return GHOST_kSuccess;
+       Boolean theOnlyButtonIsDown = ::Button();
+       buttons.clear();
+       buttons.set(GHOST_kButtonMaskLeft, theOnlyButtonIsDown);
+       return GHOST_kSuccess;
 }
 
 #define FIRSTFILEBUFLG 512
@@ -659,35 +659,35 @@ OSErr GHOST_SystemCarbon::sAEHandlerQuit(const AppleEvent *event, AppleEvent *re
 
 GHOST_TSuccess GHOST_SystemCarbon::init()
 {
-    GHOST_TSuccess success = GHOST_System::init();
-    if (success) {
+
+       GHOST_TSuccess success = GHOST_System::init();
+       if (success) {
                /*
-         * Initialize the cursor to the standard arrow shape (so that we can change it later on).
-         * This initializes the cursor's visibility counter to 0.
-         */
-        ::InitCursor();
+                * Initialize the cursor to the standard arrow shape (so that we can change it later on).
+                * This initializes the cursor's visibility counter to 0.
+                */
+               ::InitCursor();
 
                MenuRef windMenu;
                ::CreateStandardWindowMenu(0, &windMenu);
                ::InsertMenu(windMenu, 0);
                ::DrawMenuBar();
 
-        ::InstallApplicationEventHandler(sEventHandlerProc, GetEventTypeCount(kEvents), kEvents, this, &m_handler);
+               ::InstallApplicationEventHandler(sEventHandlerProc, GetEventTypeCount(kEvents), kEvents, this, &m_handler);
                
                ::AEInstallEventHandler(kCoreEventClass, kAEOpenApplication, sAEHandlerLaunch, (SInt32) this, false);
                ::AEInstallEventHandler(kCoreEventClass, kAEOpenDocuments, sAEHandlerOpenDocs, (SInt32) this, false);
                ::AEInstallEventHandler(kCoreEventClass, kAEPrintDocuments, sAEHandlerPrintDocs, (SInt32) this, false);
                ::AEInstallEventHandler(kCoreEventClass, kAEQuitApplication, sAEHandlerQuit, (SInt32) this, false);
                
-    }
-    return success;
+       }
+       return success;
 }
 
 
 GHOST_TSuccess GHOST_SystemCarbon::exit()
 {
-    return GHOST_System::exit();
+       return GHOST_System::exit();
 }
 
 
@@ -847,11 +847,11 @@ OSStatus GHOST_SystemCarbon::handleMouseEvent(EventRef event)
                                        err = noErr;
                                }
                        }
-            break;
+                       break;
                        
                case kEventMouseMoved:
                case kEventMouseDragged: {
-                       Point mousePos;
+                       Point mousePos;
 
                        if (window) {
                                //handle any tablet events that may have come with the mouse event (optional)
@@ -860,7 +860,7 @@ OSStatus GHOST_SystemCarbon::handleMouseEvent(EventRef event)
                                ::GetEventParameter(event, kEventParamMouseLocation, typeQDPoint, NULL, sizeof(Point), NULL, &mousePos);
                                pushEvent(new GHOST_EventCursor(getMilliSeconds(), GHOST_kEventCursorMove, window, mousePos.h, mousePos.v));
                                err = noErr;
-                       }
+                       }
                        break;
                }
                case kEventMouseWheelMoved:
@@ -1094,38 +1094,38 @@ bool GHOST_SystemCarbon::handleMenuCommand(GHOST_TInt32 menuResult)
        }
 
        ::HiliteMenu(0);
-    return handled;
+       return handled;
 }
 
 
 OSStatus GHOST_SystemCarbon::sEventHandlerProc(EventHandlerCallRef handler, EventRef event, void* userData)
 {
        GHOST_SystemCarbon* sys = (GHOST_SystemCarbon*) userData;
-    OSStatus err = eventNotHandledErr;
+       OSStatus err = eventNotHandledErr;
        GHOST_IWindow* window;
 #ifdef WITH_INPUT_NDOF
        GHOST_TEventNDOFData data;
 #endif
        UInt32 kind;
        
-    switch (::GetEventClass(event))
-    {
+       switch (::GetEventClass(event))
+       {
                case kEventClassAppleEvent:
                        EventRecord eventrec;
                        if (ConvertEventRefToEventRecord(event, &eventrec)) {
                                err = AEProcessAppleEvent(&eventrec);
                        }
                        break;
-        case kEventClassMouse:
-            err = sys->handleMouseEvent(event);
-            break;
+               case kEventClassMouse:
+                       err = sys->handleMouseEvent(event);
+                       break;
                case kEventClassWindow:
                        err = sys->handleWindowEvent(event);
                        break;
                case kEventClassKeyboard:
                        err = sys->handleKeyEvent(event);
                        break;
-               case kEventClassBlender :
+               case kEventClassBlender :
 #ifdef WITH_INPUT_NDOF
                        window = sys->m_windowManager->getActiveWindow();
                        sys->m_ndofManager->GHOST_NDOFGetDatas(data);
@@ -1146,11 +1146,11 @@ OSStatus GHOST_SystemCarbon::sEventHandlerProc(EventHandlerCallRef handler, Even
                        err = noErr;
                        break;
                default : 
-                       ;
+                       ;
                        break;
-   }
+       }
 
-    return err;
+       return err;
 }
 
 GHOST_TUns8* GHOST_SystemCarbon::getClipboard(bool selection) const
index 63bfa96..27a61cf 100644 (file)
@@ -1018,18 +1018,18 @@ convertXKey(KeySym key)
                        GXMAP(type,XK_bracketright,     GHOST_kKeyRightBracket);
                        GXMAP(type,XK_Pause,            GHOST_kKeyPause);
                        
-                       GXMAP(type,XK_Shift_L,          GHOST_kKeyLeftShift);
-                       GXMAP(type,XK_Shift_R,          GHOST_kKeyRightShift);
+                       GXMAP(type,XK_Shift_L,          GHOST_kKeyLeftShift);
+                       GXMAP(type,XK_Shift_R,          GHOST_kKeyRightShift);
                        GXMAP(type,XK_Control_L,        GHOST_kKeyLeftControl);
                        GXMAP(type,XK_Control_R,        GHOST_kKeyRightControl);
-                       GXMAP(type,XK_Alt_L,            GHOST_kKeyLeftAlt);
-                       GXMAP(type,XK_Alt_R,            GHOST_kKeyRightAlt);
+                       GXMAP(type,XK_Alt_L,            GHOST_kKeyLeftAlt);
+                       GXMAP(type,XK_Alt_R,            GHOST_kKeyRightAlt);
                        GXMAP(type,XK_Super_L,          GHOST_kKeyOS);
                        GXMAP(type,XK_Super_R,          GHOST_kKeyOS);
 
-                       GXMAP(type,XK_Insert,           GHOST_kKeyInsert);
-                       GXMAP(type,XK_Delete,           GHOST_kKeyDelete);
-                       GXMAP(type,XK_Home,                     GHOST_kKeyHome);
+                       GXMAP(type,XK_Insert,           GHOST_kKeyInsert);
+                       GXMAP(type,XK_Delete,           GHOST_kKeyDelete);
+                       GXMAP(type,XK_Home,                     GHOST_kKeyHome);
                        GXMAP(type,XK_End,                      GHOST_kKeyEnd);
                        GXMAP(type,XK_Page_Up,          GHOST_kKeyUpPage);
                        GXMAP(type,XK_Page_Down,        GHOST_kKeyDownPage);
@@ -1045,27 +1045,27 @@ convertXKey(KeySym key)
                        
                                /* keypad events */
                                
-                       GXMAP(type,XK_KP_0,                     GHOST_kKeyNumpad0);
-                       GXMAP(type,XK_KP_1,                     GHOST_kKeyNumpad1);
-                       GXMAP(type,XK_KP_2,                     GHOST_kKeyNumpad2);
-                       GXMAP(type,XK_KP_3,                     GHOST_kKeyNumpad3);
-                       GXMAP(type,XK_KP_4,                     GHOST_kKeyNumpad4);
-                       GXMAP(type,XK_KP_5,                     GHOST_kKeyNumpad5);
-                       GXMAP(type,XK_KP_6,                     GHOST_kKeyNumpad6);
-                       GXMAP(type,XK_KP_7,                     GHOST_kKeyNumpad7);
-                       GXMAP(type,XK_KP_8,                     GHOST_kKeyNumpad8);
-                       GXMAP(type,XK_KP_9,                     GHOST_kKeyNumpad9);
+                       GXMAP(type,XK_KP_0,                     GHOST_kKeyNumpad0);
+                       GXMAP(type,XK_KP_1,                     GHOST_kKeyNumpad1);
+                       GXMAP(type,XK_KP_2,                     GHOST_kKeyNumpad2);
+                       GXMAP(type,XK_KP_3,                     GHOST_kKeyNumpad3);
+                       GXMAP(type,XK_KP_4,                     GHOST_kKeyNumpad4);
+                       GXMAP(type,XK_KP_5,                     GHOST_kKeyNumpad5);
+                       GXMAP(type,XK_KP_6,                     GHOST_kKeyNumpad6);
+                       GXMAP(type,XK_KP_7,                     GHOST_kKeyNumpad7);
+                       GXMAP(type,XK_KP_8,                     GHOST_kKeyNumpad8);
+                       GXMAP(type,XK_KP_9,                     GHOST_kKeyNumpad9);
                        GXMAP(type,XK_KP_Decimal,       GHOST_kKeyNumpadPeriod);
 
                        GXMAP(type,XK_KP_Insert,        GHOST_kKeyNumpad0);
-                       GXMAP(type,XK_KP_End,           GHOST_kKeyNumpad1);
-                       GXMAP(type,XK_KP_Down,          GHOST_kKeyNumpad2);
+                       GXMAP(type,XK_KP_End,           GHOST_kKeyNumpad1);
+                       GXMAP(type,XK_KP_Down,          GHOST_kKeyNumpad2);
                        GXMAP(type,XK_KP_Page_Down,     GHOST_kKeyNumpad3);
-                       GXMAP(type,XK_KP_Left,          GHOST_kKeyNumpad4);
-                       GXMAP(type,XK_KP_Begin,         GHOST_kKeyNumpad5);
+                       GXMAP(type,XK_KP_Left,          GHOST_kKeyNumpad4);
+                       GXMAP(type,XK_KP_Begin,         GHOST_kKeyNumpad5);
                        GXMAP(type,XK_KP_Right,         GHOST_kKeyNumpad6);
-                       GXMAP(type,XK_KP_Home,          GHOST_kKeyNumpad7);
-                       GXMAP(type,XK_KP_Up,            GHOST_kKeyNumpad8);
+                       GXMAP(type,XK_KP_Home,          GHOST_kKeyNumpad7);
+                       GXMAP(type,XK_KP_Up,            GHOST_kKeyNumpad8);
                        GXMAP(type,XK_KP_Page_Up,       GHOST_kKeyNumpad9);
                        GXMAP(type,XK_KP_Delete,        GHOST_kKeyNumpadPeriod);
 
index 845243f..b43d955 100644 (file)
@@ -285,7 +285,7 @@ private :
                void
        processEvent(
                XEvent *xe
-       );
+       );
 
                Time
        lastEventTime(
@@ -294,7 +294,7 @@ private :
 
                bool
        generateWindowExposeEvents(
-       );
+       );
 };
 
 #endif
index ce28f8c..a5f1951 100644 (file)
@@ -305,13 +305,13 @@ protected:
                                        int sizex, int sizey, int hotX, int hotY, int fg_color, int bg_color);
                                        
        virtual GHOST_TSuccess setWindowCustomCursorShape(GHOST_TUns8 bitmap[16][2], GHOST_TUns8 mask[16][2], int hotX, int hotY);
-    
-       /** The window containing the OpenGL view */
-    CocoaWindow *m_window;
+
+       /** The window containing the OpenGL view */
+       CocoaWindow *m_window;
        
        /** The openGL view */
        CocoaOpenGLView *m_openGLView; 
-    
+
        /** The opgnGL drawing context */
        NSOpenGLContext *m_openGLContext;
        
index 937dffe..faae903 100644 (file)
@@ -1009,7 +1009,7 @@ GHOST_TSuccess GHOST_WindowCocoa::installDrawingContext(GHOST_TDrawingContextTyp
        switch (type) {
                case GHOST_kDrawingContextTypeOpenGL:
                        if (!getValid()) break;
-                                       
+
                        pixelFormat = [m_openGLView pixelFormat];
                        tmpOpenGLContext = [[NSOpenGLContext alloc] initWithFormat:pixelFormat
                                                                                                                          shareContext:s_firstOpenGLcontext];
@@ -1332,7 +1332,7 @@ GHOST_TSuccess GHOST_WindowCocoa::setWindowCustomCursorShape(GHOST_TUns8 *bitmap
        
 
        cursorImageRep = [[NSBitmapImageRep alloc] initWithBitmapDataPlanes:nil
-                                                                                                                        pixelsWide:sizex
+                                                                                                                        pixelsWide:sizex
                                                                                                                         pixelsHigh:sizey
                                                                                                                  bitsPerSample:1 
                                                                                                                samplesPerPixel:2
index d9a495a..fbab3df 100644 (file)
@@ -255,7 +255,7 @@ GHOST_WindowWin32::GHOST_WindowWin32(
                        title,                                          // pointer to window name
                        WS_POPUP | WS_MAXIMIZE,         // window style
                        left,                                           // horizontal position of window
-                       top,                                            // vertical position of window
+                       top,                                            // vertical position of window
                        width,                                          // window width
                        height,                                         // window height
                        HWND_DESKTOP,                           // handle to parent or owner window
@@ -633,7 +633,7 @@ GHOST_TSuccess GHOST_WindowWin32::setState(GHOST_TWindowState state)
                break;
        }
        SetWindowPos(m_hWnd, 0, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_NOZORDER | SWP_FRAMECHANGED); /*Clears window cache for SetWindowLongPtr */
-       return ::SetWindowPlacement(m_hWnd, &wp) == TRUE ? GHOST_kSuccess : GHOST_kFailure;
+       return ::SetWindowPlacement(m_hWnd, &wp) == TRUE ? GHOST_kSuccess : GHOST_kFailure;
 }
 
 
index de72515..160980b 100644 (file)
@@ -614,7 +614,7 @@ void GHOST_WindowX11::initXInputDevices()
                                                        ici = (XAnyClassPtr)(((char *)ici) + ici->length);
                                                }
                                        } else {
-                                               m_xtablet.StylusID= 0;
+                                               m_xtablet.StylusID= 0;
                                        }
                                }
                                else if(m_xtablet.EraserDevice==NULL && is_eraser(device_info[i].name, device_type)) {
@@ -1216,11 +1216,11 @@ activateDrawingContext(
        return GHOST_kFailure;
 }
 
-       GHOST_TSuccess 
+       GHOST_TSuccess
 GHOST_WindowX11::
 invalidate(
 ){
-       
+
        // So the idea of this function is to generate an expose event
        // for the window.
        // Unfortunately X does not handle expose events for you and 
index bc4ca9e..3565e62 100644 (file)
@@ -79,7 +79,7 @@ static inline dword                   STR_gHash(dword inDWord)
        key ^=  (key >> 13);
        key += ~(key <<  9);
        key ^=  (key >> 17);
-       return key;
+       return key;
 }
 
 enum { GOLDEN_RATIO = 0x9e3779b9 }; // arbitrary value to initialize hash funtion, well not so arbitrary
index 099661f..295669c 100644 (file)
@@ -1827,7 +1827,7 @@ int cloth_calc_helper_forces(Object *UNUSED(ob), ClothModifierData * clmd, float
        return 1;
 }
 int implicit_solver (Object *ob, float frame, ClothModifierData *clmd, ListBase *effectors)
-{              
+{
        unsigned int i=0;
        float step=0.0f, tf=clmd->sim_parms->timescale;
        Cloth *cloth = clmd->clothObject;
@@ -1981,7 +1981,7 @@ int implicit_solver (Object *ob, float frame, ClothModifierData *clmd, ListBase
 }
 
 void implicit_set_positions (ClothModifierData *clmd)
-{              
+{
        Cloth *cloth = clmd->clothObject;
        ClothVertex *verts = cloth->verts;
        unsigned int numverts = cloth->numverts, i;
index 5acd6c1..71ca797 100644 (file)
@@ -317,7 +317,7 @@ static const char *constraint_adrcodes_to_paths (int adrcode, int *array_index)
 
 /* ShapeKey types 
  * NOTE: as we don't have access to the keyblock where the data comes from (for now), 
- *             we'll just use numerical indices for now... 
+ *       we'll just use numerical indices for now...
  */
 static char *shapekey_adrcodes_to_paths (int adrcode, int *UNUSED(array_index))
 {
index f5df6ef..f27046f 100644 (file)
@@ -1283,7 +1283,7 @@ void ramp_blend(int type, float *r, float *g, float *b, float fac, const float c
                                        *g=1.0f;
                                else
                                        *g = tmp;
-                                       
+
                                        tmp = facm + fac*col[2];
                                        if(tmp <= 0.0f)
                                        *b = 0.0f;
@@ -1772,7 +1772,7 @@ int do_version_tface(Main *main, int fileload)
        int flag;
        int index;
 
-       /* sometimes mesh has no materials but will need a new one. In those
+       /* sometimes mesh has no materials but will need a new one. In those
         * cases we need to ignore the mf->mat_nr and only look at the face
         * mode because it can be zero as uninitialized or the 1st created material
         */
index 1454b3f..6741ff2 100644 (file)
@@ -428,7 +428,7 @@ Scene *add_scene(const char *name)
        sce->toolsettings->skgen_resolution = 100;
        sce->toolsettings->skgen_threshold_internal     = 0.01f;
        sce->toolsettings->skgen_threshold_external     = 0.01f;
-       sce->toolsettings->skgen_angle_limit                    = 45.0f;
+       sce->toolsettings->skgen_angle_limit                    = 45.0f;
        sce->toolsettings->skgen_length_ratio                   = 1.3f;
        sce->toolsettings->skgen_length_limit                   = 1.5f;
        sce->toolsettings->skgen_correlation_limit              = 0.98f;
index d62f665..f80607a 100644 (file)
@@ -9985,7 +9985,7 @@ static void do_versions(FileData *fd, Library *lib, Main *main)
                        sce->toolsettings->skgen_resolution = 250;
                        sce->toolsettings->skgen_threshold_internal     = 0.1f;
                        sce->toolsettings->skgen_threshold_external     = 0.1f;
-                       sce->toolsettings->skgen_angle_limit                    = 30.0f;
+                       sce->toolsettings->skgen_angle_limit                    = 30.0f;
                        sce->toolsettings->skgen_length_ratio                   = 1.3f;
                        sce->toolsettings->skgen_length_limit                   = 1.5f;
                        sce->toolsettings->skgen_correlation_limit              = 0.98f;
index a176b6e..9d96814 100644 (file)
@@ -603,7 +603,7 @@ void AnimationImporter:: Assign_color_animations(const COLLADAFW::UniqueId& list
                for (iter = animcurves.begin(); iter != animcurves.end(); iter++) {
                        FCurve * fcu = *iter;
                        BLI_addtail(AnimCurves, fcu);   
-               }                               
+               }
        }
 
 
@@ -621,16 +621,16 @@ void AnimationImporter:: Assign_float_animations(const COLLADAFW::UniqueId& list
                //all the curves belonging to the current binding
                std::vector<FCurve*> animcurves;
                for (unsigned int j = 0; j < bindings.getCount(); j++) {
-                        animcurves = curve_map[bindings[j].animation];
-               
-                        BLI_strncpy(rna_path, anim_type , sizeof(rna_path));
-                        modify_fcurve(&animcurves, rna_path, 0 );
-                        std::vector<FCurve*>::iterator iter;
-                               //Add the curves of the current animation to the object
-                               for (iter = animcurves.begin(); iter != animcurves.end(); iter++) {
-                                       FCurve * fcu = *iter;
-                                       BLI_addtail(AnimCurves, fcu);   
-                               }                               
+                       animcurves = curve_map[bindings[j].animation];
+
+                       BLI_strncpy(rna_path, anim_type , sizeof(rna_path));
+                       modify_fcurve(&animcurves, rna_path, 0 );
+                       std::vector<FCurve*>::iterator iter;
+                       //Add the curves of the current animation to the object
+                       for (iter = animcurves.begin(); iter != animcurves.end(); iter++) {
+                               FCurve * fcu = *iter;
+                               BLI_addtail(AnimCurves, fcu);
+                       }
                }
        }
        
index 2f5d9e5..a675732 100644 (file)
@@ -466,7 +466,7 @@ void MeshImporter::read_faces(COLLADAFW::Mesh *mesh, Mesh *me, int new_tris) //T
 
                if (has_normals && mp->getPositionIndices().getCount() != mp->getNormalIndices().getCount()) {
                        fprintf(stderr, "Warning: Number of normals is different from the number of vertcies, skipping normals\n");
-                       has_normals = false;
+                       has_normals = false;
                }
 
                unsigned int j, k;
index d58d51c..7f05a7c 100644 (file)
@@ -366,7 +366,7 @@ void ANIM_deselect_anim_channels (bAnimContext *ac, void *data, short datatype,
 /* Flush visibility (for Graph Editor) changes up/down hierarchy for changes in the given setting 
  *     - anim_data: list of the all the anim channels that can be chosen
  *             -> filtered using ANIMFILTER_CHANNELS only, since if we took VISIBLE too,
- *               then the channels under closed expanders get ignored...
+ *               then the channels under closed expanders get ignored...
  *     - ale_setting: the anim channel (not in the anim_data list directly, though occuring there)
  *             with the new state of the setting that we want flushed up/down the hierarchy 
  *     - setting: type of setting to set
index 58e1549..b525508 100644 (file)
@@ -540,8 +540,8 @@ static short visualkey_can_use (PointerRNA *ptr, PropertyRNA *prop)
                
        /* get first constraint and determine type of keyframe constraints to check for 
         *      - constraints can be on either Objects or PoseChannels, so we only check if the
-        *        ptr->type is RNA_Object or RNA_PoseBone, which are the RNA wrapping-info for
-        *        those structs, allowing us to identify the owner of the data 
+        *    ptr->type is RNA_Object or RNA_PoseBone, which are the RNA wrapping-info for
+        *    those structs, allowing us to identify the owner of the data
         */
        if (ptr->type == &RNA_Object) {
                /* Object */
index b730913..3c810f7 100644 (file)
@@ -426,7 +426,7 @@ void ANIM_channel_setting_set(bAnimContext *ac, bAnimListElem *ale, int setting,
 /* Flush visibility (for Graph Editor) changes up/down hierarchy for changes in the given setting 
  *     - anim_data: list of the all the anim channels that can be chosen
  *             -> filtered using ANIMFILTER_CHANNELS only, since if we took VISIBLE too,
- *               then the channels under closed expanders get ignored...
+ *               then the channels under closed expanders get ignored...
  *     - ale_setting: the anim channel (not in the anim_data list directly, though occuring there)
  *             with the new state of the setting that we want flushed up/down the hierarchy 
  *     - setting: type of setting to set
index 0aaf6fe..30ae69b 100644 (file)
@@ -785,7 +785,7 @@ static void VIEW2D_OT_zoom_out(wmOperatorType *ot)
 }
 
 /* ********************************************************* */
-/* DRAG-ZOOM OPERATOR                                                                   */
+/* DRAG-ZOOM OPERATOR                                                                   */
 
 /*     MMB Drag - allows non-uniform scaling by dragging mouse
  *
index 8951df9..041cb90 100644 (file)
@@ -1375,9 +1375,9 @@ static const char *editortype_pup(void)
                   "|Outliner %x3"
                   "|User Preferences %x19"
                   "|Info%x7"
-                                  
+
                   "|%l"
-                  
+
                   "|File Browser %x5"
                   
                   "|%l"
index eb91926..5fe47f8 100644 (file)
@@ -3702,7 +3702,7 @@ static void do_projectpaint_draw_f(ProjPaintState *ps, ProjPixel *projPixel, flo
                if(use_color_correction){
                        srgb_to_linearrgb_v3_v3(rgba, ps->brush->rgb);
                }
-               else {
+               else {
                        VECCOPY(rgba, ps->brush->rgb);
                }
                rgba[3] = 1.0;
index 3121dda..126d75e 100644 (file)
@@ -87,7 +87,7 @@ static void info_report_color(unsigned char *fg, unsigned char *bg, Report *repo
                        if (bool) { bg[0]=220; bg[1]=128; bg[2]=96;  }
                        else      { bg[0]=214; bg[1]=122; bg[2]=90;  }
                }
-#if 0 // XXX: this looks like the selected colour, so don't use this
+#if 0 // XXX: this looks like the selected color, so don't use this
                else if (report->type & RPT_OPERATOR_ALL) {
                        if (bool) { bg[0]=96;  bg[1]=128; bg[2]=255; }
                        else      { bg[0]=90;  bg[1]=122; bg[2]=249; }
index 65ce2e7..10ca482 100644 (file)
@@ -1248,7 +1248,7 @@ static void outliner_draw_tree_element(bContext *C, uiBlock *block, Scene *scene
                if ( (SEARCHING_OUTLINER(soops) || (soops->outlinevis==SO_DATABLOCKS && soops->search_string[0]!=0)) && 
                         (tselem->flag & TSE_SEARCHMATCH)) 
                {
-                       /* TODO - add search highlight colour to theme? */
+                       /* TODO - add search highlight color to theme? */
                        glColor4f(0.2f, 0.5f, 0.2f, 0.3f);
                        glRecti(startx, *starty+1, ar->v2d.cur.xmax, *starty+UI_UNIT_Y-1);
                }
index 4853448..2f17723 100644 (file)
@@ -425,8 +425,8 @@ typedef struct TransInfo {
 #define TD_BEZTRIPLE           (1 << 12)       /* if this is a bez triple, we need to restore the handles, if this is set transdata->misc.hdata needs freeing */
 #define TD_NO_LOC                      (1 << 13)       /* when this is set, don't apply translation changes to this element */
 #define TD_NOTIMESNAP          (1 << 14)       /* for Graph Editor autosnap, indicates that point should not undergo autosnapping */
-#define TD_INTVALUES           (1 << 15)       /* for Graph Editor - curves that can only have int-values need their keyframes tagged with this */
-#define TD_MIRROR_EDGE         (1 << 16)       /* For editmode mirror, clamp to x = 0 */
+#define TD_INTVALUES           (1 << 15)       /* for Graph Editor - curves that can only have int-values need their keyframes tagged with this */
+#define TD_MIRROR_EDGE         (1 << 16)       /* For editmode mirror, clamp to x = 0 */
 #define TD_MOVEHANDLE1         (1 << 17)       /* For fcurve handles, move them along with their keyframes */
 #define TD_MOVEHANDLE2         (1 << 18)
 #define TD_PBONE_LOCAL_MTX_P (1 << 19) /* exceptional case with pose bone rotating when a parent bone has 'Local Location' option enabled and rotating also transforms it. */
index 83f79ea..b7a5f4b 100644 (file)
@@ -5314,7 +5314,7 @@ void createTransData(bContext *C, TransInfo *t)
                t->ext = NULL;
                if (t->obedit->type == OB_MESH) {
                        createTransEditVerts(C, t);
-                  }
+               }
                else if ELEM(t->obedit->type, OB_CURVE, OB_SURF) {
                        createTransCurveVerts(C, t);
                }
@@ -5327,7 +5327,7 @@ void createTransData(bContext *C, TransInfo *t)
                else if (t->obedit->type==OB_ARMATURE) {
                        t->flag &= ~T_PROP_EDIT;
                        createTransArmatureVerts(t);
-                 }
+               }
                else {
                        printf("edit type not implemented!\n");
                }
index ce3a378..0aaddf0 100644 (file)
@@ -629,7 +629,7 @@ static void GPU_buffer_copy_normal(DerivedMesh *dm, float *varray, int *index, i
                if(smoothnormal) {
                        /* copy vertex normal */
                        normal_short_to_float_v3(&varray[start], mvert[f->v1].no);
-                       normal_short_to_float_v3(&varray[start+3], mvert[f->v2].no);
+                       normal_short_to_float_v3(&varray[start+3], mvert[f->v2].no);
                        normal_short_to_float_v3(&varray[start+6], mvert[f->v3].no);
 
                        if(f->v4) {
index 4f79d57..120c203 100644 (file)
@@ -717,7 +717,7 @@ void GPU_paint_update_image(Image *ima, int x, int y, int w, int h, int mipmap)
                        }
                        else {
                                /* Do partial drawing. 'buffer' holds only the changed part. Needed for color corrected result */
-                               float *buffer = (float *)MEM_mallocN(w*h*sizeof(float)*4, "temp_texpaint_float_buf");
+                               float *buffer = (float *)MEM_mallocN(w*h*sizeof(float)*4, "temp_texpaint_float_buf");
                                IMB_partial_rect_from_float(ibuf, buffer, x, y, w, h);
                                glBindTexture(GL_TEXTURE_2D, ima->bindcode);
                                glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, w, h, GL_RGBA,
index 2e45c0e..d79e881 100644 (file)
@@ -183,9 +183,9 @@ struct anim_index * IMB_indexer_open(const char * name)
 
        BLI_strncpy(idx->name, name, sizeof(idx->name));
        
-               fseek(fp, 0, SEEK_END);
+       fseek(fp, 0, SEEK_END);
 
-       idx->num_entries = (ftell(fp) - 12) 
+       idx->num_entries = (ftell(fp) - 12)
                / (sizeof(int) // framepos
                   + sizeof(unsigned long long) // seek_pos
                   + sizeof(unsigned long long) // seek_pos_dts
index b7a8f21..128f19b 100644 (file)
@@ -93,7 +93,7 @@ typedef struct ClothCollSettings
 {
        struct  LinkNode *collision_list; /* e.g. pointer to temp memory for collisions */
        float   epsilon;                /* min distance for collisions.         */
-       float   self_friction;          /* Fiction/damping with self contact.                   */
+       float   self_friction;          /* Fiction/damping with self contact. */
        float   friction;               /* Friction/damping applied on contact with other object.*/
        float   selfepsilon;            /* for selfcollision */
        float repel_force, distance_repel;
index 1be2c81..e04bdd4 100644 (file)
@@ -344,7 +344,7 @@ typedef struct bPivotConstraint {
         *      Either target object + offset, or just offset is used
         */
        struct Object           *tar;                   /* target object (optional) */
-       char            subtarget[32];          /* subtarget name (optional) */
+       char            subtarget[32];          /* subtarget name (optional) */
        float           offset[3];              /* offset from the target to use, regardless of whether it exists */
        
        /* Rotation-driven activation:
index 43a4b99..8fe8b3b 100644 (file)
@@ -56,7 +56,7 @@ typedef struct IpoDriver {
        short blocktype, adrcode;       /* sub-channel to use */
        
        short type, flag;                       /* driver settings */
-       char name[128];                         /* bone, or python expression here */
+       char name[128];                         /* bone, or python expression here */
 } IpoDriver;
 
 /* --- IPO Curve --- */
index e9e78ab..229f14d 100644 (file)
@@ -808,7 +808,7 @@ typedef struct WeightVGEditModifierData {
        /* Mapping stuff. */
        struct CurveMapping *cmap_curve;  /* The custom mapping curve! */
 
-       /* The add/remove vertices weight thresholds. */
+       /* The add/remove vertices weight thresholds. */
        float   add_threshold, rem_threshold;
 
        /* Masking options. */
index 9f176a2..f0f346f 100644 (file)
@@ -236,8 +236,8 @@ typedef struct RenderData {
        short stereomode;       /* standalone player stereo settings */  //  XXX deprecated since 2.5
        
        short dimensionspreset;         /* for the dimensions presets menu */
-       
-        short filtertype;      /* filter is box, tent, gauss, mitch, etc */
+
+       short filtertype;       /* filter is box, tent, gauss, mitch, etc */
 
        short size, maximsize;  /* size in %, max in Kb */
        /* from buttons: */
@@ -479,8 +479,8 @@ typedef struct GameData {
 } GameData;
 
 #define STEREO_NOSTEREO                1
-#define STEREO_ENABLED                 2
-#define STEREO_DOME                    3
+#define STEREO_ENABLED         2
+#define STEREO_DOME                    3
 
 //#define STEREO_NOSTEREO               1
 #define STEREO_QUADBUFFERED 2
@@ -838,7 +838,7 @@ typedef struct Scene {
        void *sound_scrub_handle;
        void *speaker_handles;
        
-       void *fps_info;                                 /* (runtime) info/cache used for presenting playback framerate info to the user */
+       void *fps_info;                                 /* (runtime) info/cache used for presenting playback framerate info to the user */
        
        /* none of the dependancy graph  vars is mean to be saved */
        struct  DagForest *theDag;
index 44d645f..b81b370 100644 (file)
@@ -2777,7 +2777,7 @@ static void rna_def_userdef_input(BlenderRNA *brna)
        RNA_def_property_range(prop, 3, 40);
        RNA_def_property_ui_text(prop, "Drag Threshold", "Amount of pixels you have to drag before dragging UI items happens");
 
-       /* 3D mouse settings */
+       /* 3D mouse settings */
        /* global options */
        prop= RNA_def_property(srna, "ndof_sensitivity", PROP_FLOAT, PROP_NONE);
        RNA_def_property_range(prop, 0.25f, 4.0f);
index 6149947..c18a35f 100644 (file)
@@ -74,7 +74,7 @@ static CompBuf *node_composit_get_image(RenderData *rd, Image *ima, ImageUser *i
 
        ibuf= BKE_image_get_ibuf(ima, iuser);
        if(ibuf==NULL || (ibuf->rect==NULL && ibuf->rect_float==NULL)) {
-               return NULL;
+               return NULL;
        }
 
        if (ibuf->rect_float == NULL) {
index 35f2dbf..8225c98 100644 (file)
@@ -551,8 +551,8 @@ int node_group_ungroup(bNodeTree *ntree, bNode *gnode)
        }
        
        /* delete the group instance. this also removes old input links! */
-       nodeFreeNode(ntree, gnode);
-       
+       nodeFreeNode(ntree, gnode);
+
        /* free the group tree (takes care of user count) */
        free_libblock(&G.main->nodetree, wgroup);
        
index dfff35b..5506525 100644 (file)
@@ -441,7 +441,7 @@ int RE_rayobject_intersect(RayObject *r, Isect *i)
        }
        else {
                assert(0);
-       return 0;
+               return 0;
        }
 }
 
index 331358f..8fc3c93 100644 (file)
@@ -116,8 +116,8 @@ void bvh_hint_bb(Tree *tree, LCTSHint *hint, float *min, float *max)
 {
        //TODO renable hint support
        {
-               hint->size = 0;
-               hint->stack[hint->size++] = (RayObject*)tree->root;
+               hint->size = 0;
+               hint->stack[hint->size++] = (RayObject*)tree->root;
        }
 }
 /* the cast to pointer function is needed to workarround gcc bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=11407 */
index a99c57a..0d1526f 100644 (file)
@@ -152,8 +152,8 @@ void bvh_hint_bb(Tree *tree, LCTSHint *hint, float *min, float *max)
 {
        //TODO renable hint support
        {
-               hint->size = 0;
-               hint->stack[hint->size++] = (RayObject*)tree->root;
+               hint->size = 0;
+               hint->stack[hint->size++] = (RayObject*)tree->root;
        }
 }
 /* the cast to pointer function is needed to workarround gcc bug: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=11407 */
index 25eada4..620477f 100644 (file)
@@ -154,8 +154,8 @@ void bvh_hint_bb(Tree *tree, LCTSHint *hint, float *min, float *max)
 {
        //TODO renable hint support
        {
-               hint->size = 0;
-               hint->stack[hint->size++] = (RayObject*)tree->root;
+               hint->size = 0;
+               hint->stack[hint->size++] = (RayObject*)tree->root;
        }
 }
 
index 27c825e..195b037 100644 (file)
@@ -1349,7 +1349,7 @@ static void particle_billboard(Render *re, ObjectRen *obr, Material *ma, Particl
        int totsplit = bb->uv_split * bb->uv_split;
        int tile, x, y;
        /* Tile offsets */
-       float uvx = 0.0f, uvy = 0.0f, uvdx = 1.0f, uvdy = 1.0f, time = 0.0f;
+       float uvx = 0.0f, uvy = 0.0f, uvdx = 1.0f, uvdy = 1.0f, time = 0.0f;
 
        vlr= RE_findOrAddVlak(obr, obr->totvlak++);
        vlr->v1= RE_findOrAddVert(obr, obr->totvert++);
index 56108f6..d25b0be 100644 (file)
@@ -483,7 +483,7 @@ static int no_joystick(int UNUSED(argc), const char **UNUSED(argv), void *data)
        SYS_SystemHandle *syshandle = data;
 
        /**
-               don't initialize joysticks if user doesn't want to use joysticks
+               don't initialize joysticks if user doesn't want to use joysticks
                failed joystick initialization delays over 5 seconds, before game engine start
        */
        SYS_WriteCommandLineInt(*syshandle, "nojoystick",1);
index df3a575..5442878 100644 (file)
@@ -279,19 +279,19 @@ PyObject* BL_ArmatureChannel::py_attr_get_joint_rotation(void *self_v, const str
                if (sa > FLT_EPSILON) {
                        norm = atan2(sa,ca)/sa;
                } else {
-                  if (ca < 0.0) {
-                          norm = M_PI;
-                          mul_v3_fl(joints,0.f);
-                          if (joint_mat[0][0] > 0.f) {
-                                  joints[0] = 1.0f;
-                          } else if (joint_mat[1][1] > 0.f) {
-                                  joints[1] = 1.0f;
-                          } else {
-                                  joints[2] = 1.0f;
-                          }
-                  } else {
-                          norm = 0.0;
-                  }
+                       if (ca < 0.0) {
+                               norm = M_PI;
+                               mul_v3_fl(joints,0.f);
+                               if (joint_mat[0][0] > 0.f) {
+                                       joints[0] = 1.0f;
+                               } else if (joint_mat[1][1] > 0.f) {
+                                       joints[1] = 1.0f;
+                               } else {
+                                       joints[2] = 1.0f;
+                               }
+                       } else {
+                               norm = 0.0;
+                       }
                }
                mul_v3_fl(joints,norm);
                break;
index 2c2fd05..8633a14 100644 (file)
@@ -642,7 +642,7 @@ bool ConvertMaterial(
        if(validmat && (mat->mode & MA_TRANSP) && (mat->mode & MA_ZTRANSP) && (material->alphablend == GEMAT_SOLID))
                material->alphablend = GEMAT_ALPHA;
 
-       // always zsort alpha + add
+       // always zsort alpha + add
        if((ELEM3(material->alphablend, GEMAT_ALPHA, GEMAT_ALPHA_SORT, GEMAT_ADD) || texalpha) && (material->alphablend != GEMAT_CLIP )) {
                material->ras_mode |= ALPHA;
                material->ras_mode |= (mat && (mat->game.alpha_blend & GEMAT_ALPHA_SORT))? ZSORT: 0;
index f323373..f6cd581 100644 (file)
@@ -48,7 +48,7 @@ unsigned int KX_Hash(void * inDWord)
        key += ~(key <<  9);
        key ^=  (key >> 17);
 
-       return (unsigned int)(key & 0xffffffff);
+       return (unsigned int)(key & 0xffffffff);
 }
 
 
index 934f2a8..ade54f6 100644 (file)
@@ -487,12 +487,12 @@ static int listvalue_buffer_contains(PyObject *self_v, PyObject *value)
 static  PySequenceMethods listvalue_as_sequence = {
        listvalue_bufferlen,//(inquiry)buffer_length, /*sq_length*/
        listvalue_buffer_concat, /*sq_concat*/
-       NULL, /*sq_repeat*/
+       NULL, /*sq_repeat*/
        listvalue_buffer_item, /*sq_item*/
 // TODO, slicing in py3
        NULL, // listvalue_buffer_slice, /*sq_slice*/
-       NULL, /*sq_ass_item*/
-       NULL, /*sq_ass_slice*/
+       NULL, /*sq_ass_item*/
+       NULL, /*sq_ass_slice*/
        (objobjproc)listvalue_buffer_contains,  /* sq_contains */
        (binaryfunc) NULL, /* sq_inplace_concat */
        (ssizeargfunc) NULL, /* sq_inplace_repeat */
@@ -515,12 +515,12 @@ PyTypeObject CListValue::Type = {
        sizeof(PyObjectPlus_Proxy), /*tp_basicsize*/
        0,                              /*tp_itemsize*/
        /* methods */
-       py_base_dealloc,                        /*tp_dealloc*/
-       0,                              /*tp_print*/
+       py_base_dealloc,                        /*tp_dealloc*/
+       0,                              /*tp_print*/
        0,                      /*tp_getattr*/
        0,                      /*tp_setattr*/
-       0,                              /*tp_compare*/
-       py_base_repr,                           /*tp_repr*/
+       0,                      /*tp_compare*/
+       py_base_repr, /*tp_repr*/
        0,                              /*tp_as_number*/
        &listvalue_as_sequence, /*tp_as_sequence*/
        &instance_as_mapping,           /*tp_as_mapping*/
index 080e719..d3b2eac 100644 (file)
@@ -563,7 +563,7 @@ public:
        
        /** enable/disable display of deprecation warnings */
        static void                     SetDeprecationWarnings(bool ignoreDeprecationWarnings);
-       /** Shows a deprecation warning */
+       /** Shows a deprecation warning */
        static void                     ShowDeprecationWarning_func(const char* method,const char* prop);
        static void                     ClearDeprecationWarning();
        
index 19633c2..b61e4f4 100644 (file)
@@ -83,8 +83,8 @@ void SCA_JoystickManager::NextFrame(double curtime,double deltatime)
 
 SCA_Joystick *SCA_JoystickManager::GetJoystickDevice( short int joyindex)
 {
-       /* 
-        *Return the instance of SCA_Joystick for use 
-        */
+       /*
+        *Return the instance of SCA_Joystick for use
+        */
        return m_joystick[joyindex];
 }
index ebb291b..7df08b8 100644 (file)
@@ -253,7 +253,7 @@ bool KX_CameraActuator::Update(double curtime, bool frame)
        /* ... set up some parameters ...                                        */
        /* missing here: the 'floorloc' of the actor's shadow */
 
-       mindistsq= m_minHeight*m_minHeight;
+       mindistsq= m_minHeight*m_minHeight;
        maxdistsq= m_maxHeight*m_maxHeight;
 
        /* C1: not checked... is a future option                                 */
index acd25ac..8e6126b 100644 (file)
@@ -765,12 +765,12 @@ else
                                m_logger->StartLog(tc_scenegraph, m_kxsystem->GetTimeInSeconds(), true);
                                SG_SetActiveStage(SG_STAGE_ACTUATOR);
                                scene->UpdateParents(m_clockTime);
-                                
-                               scene->setSuspendedTime(0.0);
+
+                               scene->setSuspendedTime(0.0);
                        } // suspended
-                       else
-                               if(scene->getSuspendedTime()==0.0)
-                                       scene->setSuspendedTime(m_clockTime);
+                       else
+                               if(scene->getSuspendedTime()==0.0)
+                                       scene->setSuspendedTime(m_clockTime);
 
                        m_logger->StartLog(tc_services, m_kxsystem->GetTimeInSeconds(), true);
                }
index 73c5d94..0778766 100644 (file)
@@ -140,7 +140,7 @@ class KX_MouseFocusSensor : public SCA_MouseSensor
         */
        bool m_positive_event;
 
-       /**
+       /**
         * Tests whether the object is in mouse focus for this camera
         */
        bool ParentObjectHasFocusCamera(KX_Camera *cam);
index 913a1ad..eca4d45 100644 (file)
@@ -49,8 +49,8 @@ KX_NearSensor::KX_NearSensor(SCA_EventManager* eventmgr,
                                                         float resetmargin,
                                                         bool bFindMaterial,
                                                         const STR_String& touchedpropname,
-                                                        PHY_IPhysicsController* ctrl)
-                        :KX_TouchSensor(eventmgr,
+                                                        PHY_IPhysicsController* ctrl)
+                                                       :KX_TouchSensor(eventmgr,
                                                         gameobj,
                                                         bFindMaterial,
                                                         false,
index 0737535..3ba257b 100644 (file)
@@ -100,7 +100,7 @@ class KX_ObjectActuator : public SCA_IActuator
        // used in servo control
        MT_Vector3              m_previous_error;
        MT_Vector3              m_error_accumulator;
-       KX_LocalFlags   m_bitLocalFlag;
+       KX_LocalFlags   m_bitLocalFlag;
        KX_GameObject*  m_reference;
        // A hack bool -- oh no sorry everyone
        // This bool is used to check if we have informed 
index a850cc7..6984465 100644 (file)
@@ -56,8 +56,8 @@ class KX_ParentActuator : public SCA_IActuator
        
        
 
- public:
-       enum KX_PARENTACT_MODE
+public:
+       enum KX_PARENTACT_MODE
        {
                KX_PARENT_NODEF = 0,
                KX_PARENT_SET,
@@ -65,7 +65,7 @@ class KX_ParentActuator : public SCA_IActuator
                KX_PARENT_MAX
 
        };
+
        KX_ParentActuator(class SCA_IObject* gameobj,
                                                int mode,
                                                bool addToCompound,
index 04a53fb..729376f 100644 (file)
@@ -375,9 +375,9 @@ static PyObject *KX_PythonSeq_getIter(KX_PythonSeq *self)
                return (PyObject *)self;
        } else {
                return KX_PythonSeq_CreatePyObject(self->base, self->type);
-       }
- }
+       }
+}
+
 
 /*
  * Return next KX_PythonSeq iter.
index 04b2c00..ecae0eb 100644 (file)
@@ -50,10 +50,10 @@ class KX_SCA_DynamicActuator : public SCA_IActuator
        float m_setmass;
  public:
        KX_SCA_DynamicActuator(
-               SCA_IObject* gameobj, 
-               short dyn_operation,
-               float setmass
-       );
+               SCA_IObject* gameobj,
+               short dyn_operation,
+               float setmass
+               );
 
        ~KX_SCA_DynamicActuator(
        );
index 0163e18..0b39187 100644 (file)
@@ -72,7 +72,7 @@ public:
        {
                if (! --m_refcount)
                {
-                       delete this;
+                       delete this;
                }
        }
 
index 01ada4e..c39904b 100644 (file)
@@ -128,9 +128,9 @@ Destruct()
        // We'll delete m_parent_relation now anyway.
        
        delete(m_parent_relation);
-       m_parent_relation = NULL;               
+       m_parent_relation = NULL;
 
-       if (m_children.begin() != m_children.end())
+       if (m_children.begin() != m_children.end())
        {
                NodeList::iterator childit;
                for (childit = m_children.begin();childit!=m_children.end();++childit)