[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40538] trunk/blender: whitespace cleanup
Campbell Barton
ideasman42 at gmail.com
Sun Sep 25 14:31:21 CEST 2011
Revision: 40538
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40538
Author: campbellbarton
Date: 2011-09-25 12:31:21 +0000 (Sun, 25 Sep 2011)
Log Message:
-----------
whitespace cleanup
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/intern/ghost/intern/GHOST_DropTargetWin32.h
trunk/blender/intern/ghost/intern/GHOST_EventManager.h
trunk/blender/intern/ghost/intern/GHOST_System.h
trunk/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp
trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
trunk/blender/intern/ghost/intern/GHOST_SystemX11.h
trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.h
trunk/blender/intern/ghost/intern/GHOST_WindowCocoa.mm
trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
trunk/blender/intern/string/STR_HashedString.h
trunk/blender/source/blender/blenkernel/intern/implicit.c
trunk/blender/source/blender/blenkernel/intern/ipo.c
trunk/blender/source/blender/blenkernel/intern/material.c
trunk/blender/source/blender/blenkernel/intern/scene.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/collada/AnimationImporter.cpp
trunk/blender/source/blender/collada/MeshImporter.cpp
trunk/blender/source/blender/editors/animation/anim_channels_edit.c
trunk/blender/source/blender/editors/animation/keyframing.c
trunk/blender/source/blender/editors/include/ED_anim_api.h
trunk/blender/source/blender/editors/interface/view2d_ops.c
trunk/blender/source/blender/editors/screen/area.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/space_info/info_draw.c
trunk/blender/source/blender/editors/space_outliner/outliner_draw.c
trunk/blender/source/blender/editors/transform/transform.h
trunk/blender/source/blender/editors/transform/transform_conversions.c
trunk/blender/source/blender/gpu/intern/gpu_buffers.c
trunk/blender/source/blender/gpu/intern/gpu_draw.c
trunk/blender/source/blender/imbuf/intern/indexer.c
trunk/blender/source/blender/makesdna/DNA_cloth_types.h
trunk/blender/source/blender/makesdna/DNA_constraint_types.h
trunk/blender/source/blender/makesdna/DNA_ipo_types.h
trunk/blender/source/blender/makesdna/DNA_modifier_types.h
trunk/blender/source/blender/makesdna/DNA_scene_types.h
trunk/blender/source/blender/makesrna/intern/rna_userdef.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_image.c
trunk/blender/source/blender/nodes/intern/node_common.c
trunk/blender/source/blender/render/intern/raytrace/rayobject.cpp
trunk/blender/source/blender/render/intern/raytrace/rayobject_qbvh.cpp
trunk/blender/source/blender/render/intern/raytrace/rayobject_svbvh.cpp
trunk/blender/source/blender/render/intern/raytrace/rayobject_vbvh.cpp
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/creator/creator.c
trunk/blender/source/gameengine/Converter/BL_ArmatureChannel.cpp
trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
trunk/blender/source/gameengine/Expressions/KX_HashedPtr.cpp
trunk/blender/source/gameengine/Expressions/ListValue.cpp
trunk/blender/source/gameengine/Expressions/PyObjectPlus.h
trunk/blender/source/gameengine/GameLogic/SCA_JoystickManager.cpp
trunk/blender/source/gameengine/Ketsji/KX_CameraActuator.cpp
trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
trunk/blender/source/gameengine/Ketsji/KX_MouseFocusSensor.h
trunk/blender/source/gameengine/Ketsji/KX_NearSensor.cpp
trunk/blender/source/gameengine/Ketsji/KX_ObjectActuator.h
trunk/blender/source/gameengine/Ketsji/KX_ParentActuator.h
trunk/blender/source/gameengine/Ketsji/KX_PythonSeq.cpp
trunk/blender/source/gameengine/Ketsji/KX_SCA_DynamicActuator.h
trunk/blender/source/gameengine/Network/NG_NetworkMessage.h
trunk/blender/source/gameengine/SceneGraph/SG_Node.cpp
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-09-25 11:51:28 UTC (rev 40537)
+++ trunk/blender/CMakeLists.txt 2011-09-25 12:31:21 UTC (rev 40538)
@@ -1006,7 +1006,7 @@
mark_as_advanced(SYSTEMSTUBS_LIBRARY)
if(SYSTEMSTUBS_LIBRARY)
set(PLATFORM_LINKLIBS stdc++ SystemStubs)
- else()
+ else()
set(PLATFORM_LINKLIBS stdc++)
endif()
Modified: trunk/blender/intern/ghost/intern/GHOST_DropTargetWin32.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_DropTargetWin32.h 2011-09-25 11:51:28 UTC (rev 40537)
+++ trunk/blender/intern/ghost/intern/GHOST_DropTargetWin32.h 2011-09-25 12:31:21 UTC (rev 40538)
@@ -53,7 +53,7 @@
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:
Modified: trunk/blender/intern/ghost/intern/GHOST_EventManager.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_EventManager.h 2011-09-25 11:51:28 UTC (rev 40537)
+++ trunk/blender/intern/ghost/intern/GHOST_EventManager.h 2011-09-25 12:31:21 UTC (rev 40538)
@@ -127,9 +127,9 @@
* 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
);
/**
Modified: trunk/blender/intern/ghost/intern/GHOST_System.h
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_System.h 2011-09-25 11:51:28 UTC (rev 40537)
+++ trunk/blender/intern/ghost/intern/GHOST_System.h 2011-09-25 12:31:21 UTC (rev 40538)
@@ -250,7 +250,7 @@
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.
*/
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp 2011-09-25 11:51:28 UTC (rev 40537)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemCarbon.cpp 2011-09-25 12:31:21 UTC (rev 40538)
@@ -394,7 +394,7 @@
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 @@
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 @@
}
} 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 @@
// 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 @@
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 @@
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 @@
::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 @@
}
::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 @@
err = noErr;
break;
default :
- ;
+ ;
break;
- }
+ }
- return err;
+ return err;
}
GHOST_TUns8* GHOST_SystemCarbon::getClipboard(bool selection) const
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list