diff options
Diffstat (limited to 'intern')
-rw-r--r-- | intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp | 6 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_SystemCarbon.cpp | 3 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_SystemCocoa.mm | 3 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_SystemX11.cpp | 3 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_WindowCarbon.cpp | 3 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_WindowWin32.cpp | 6 | ||||
-rw-r--r-- | intern/ghost/intern/GHOST_WindowX11.cpp | 3 | ||||
-rw-r--r-- | intern/smoke/intern/smoke_API.cpp | 3 |
8 files changed, 19 insertions, 11 deletions
diff --git a/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp index 9a79c412e4f..543e7e087b1 100644 --- a/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp +++ b/intern/bsp/test/BSP_GhostTest/BSP_GhostTest3D.cpp @@ -202,7 +202,7 @@ Operate( } - void + void BSP_GhostTestApp3D:: UpdateFrame( ){ @@ -210,9 +210,9 @@ if (m_window) { GHOST_Rect v_rect; m_window->getClientBounds(v_rect); - + glViewport(0,0,v_rect.getWidth(),v_rect.getHeight()); - + } } diff --git a/intern/ghost/intern/GHOST_SystemCarbon.cpp b/intern/ghost/intern/GHOST_SystemCarbon.cpp index be58d179aa4..5db392e1706 100644 --- a/intern/ghost/intern/GHOST_SystemCarbon.cpp +++ b/intern/ghost/intern/GHOST_SystemCarbon.cpp @@ -579,7 +579,8 @@ GHOST_TSuccess GHOST_SystemCarbon::getButtons(GHOST_Buttons& buttons) const static bool g_hasFirstFile = false; static char g_firstFileBuf[512]; -extern "C" int GHOST_HACK_getFirstFile(char buf[FIRSTFILEBUFLG]) { +extern "C" int GHOST_HACK_getFirstFile(char buf[FIRSTFILEBUFLG]) +{ if (g_hasFirstFile) { strncpy(buf, g_firstFileBuf, FIRSTFILEBUFLG - 1); buf[FIRSTFILEBUFLG - 1] = '\0'; diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index 12a732e59ef..50d8cfd074b 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -451,7 +451,8 @@ static bool g_hasFirstFile = false; static char g_firstFileBuf[512]; //TODO:Need to investigate this. Function called too early in creator.c to have g_hasFirstFile == true -extern "C" int GHOST_HACK_getFirstFile(char buf[FIRSTFILEBUFLG]) { +extern "C" int GHOST_HACK_getFirstFile(char buf[FIRSTFILEBUFLG]) +{ if (g_hasFirstFile) { strncpy(buf, g_firstFileBuf, FIRSTFILEBUFLG - 1); buf[FIRSTFILEBUFLG - 1] = '\0'; diff --git a/intern/ghost/intern/GHOST_SystemX11.cpp b/intern/ghost/intern/GHOST_SystemX11.cpp index 61c65384d2d..d701f9264b8 100644 --- a/intern/ghost/intern/GHOST_SystemX11.cpp +++ b/intern/ghost/intern/GHOST_SystemX11.cpp @@ -296,7 +296,8 @@ findGhostWindow( } -static void SleepTillEvent(Display *display, GHOST_TInt64 maxSleep) { +static void SleepTillEvent(Display *display, GHOST_TInt64 maxSleep) +{ int fd = ConnectionNumber(display); fd_set fds; diff --git a/intern/ghost/intern/GHOST_WindowCarbon.cpp b/intern/ghost/intern/GHOST_WindowCarbon.cpp index b226d5ec83e..ab7325fcef8 100644 --- a/intern/ghost/intern/GHOST_WindowCarbon.cpp +++ b/intern/ghost/intern/GHOST_WindowCarbon.cpp @@ -70,7 +70,8 @@ const EventTypeSpec kWEvents[] = { { kEventClassWindow, kEventWindowZoom }, /* for new zoom behaviour */ }; -static OSStatus myWEventHandlerProc(EventHandlerCallRef handler, EventRef event, void* userData) { +static OSStatus myWEventHandlerProc(EventHandlerCallRef handler, EventRef event, void* userData) +{ WindowRef mywindow; GHOST_WindowCarbon *ghost_window; OSStatus err; diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp index cb4d3f87e83..8e37d1832df 100644 --- a/intern/ghost/intern/GHOST_WindowWin32.cpp +++ b/intern/ghost/intern/GHOST_WindowWin32.cpp @@ -1269,7 +1269,8 @@ GHOST_TSuccess GHOST_WindowWin32::endProgressBar() /* Ron Fosner's code for weighting pixel formats and forcing software. See http://www.opengl.org/resources/faq/technical/weight.cpp */ -static int WeightPixelFormat(PIXELFORMATDESCRIPTOR& pfd) { +static int WeightPixelFormat(PIXELFORMATDESCRIPTOR& pfd) +{ int weight = 0; /* assume desktop color depth is 32 bits per pixel */ @@ -1302,7 +1303,8 @@ static int WeightPixelFormat(PIXELFORMATDESCRIPTOR& pfd) { /* A modification of Ron Fosner's replacement for ChoosePixelFormat */ /* returns 0 on error, else returns the pixel format number to be used */ -static int EnumPixelFormats(HDC hdc) { +static int EnumPixelFormats(HDC hdc) +{ int iPixelFormat; int i, n, w, weight = 0; PIXELFORMATDESCRIPTOR pfd; diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp index 5611644f8f2..71e3f7b3340 100644 --- a/intern/ghost/intern/GHOST_WindowX11.cpp +++ b/intern/ghost/intern/GHOST_WindowX11.cpp @@ -472,7 +472,8 @@ GHOST_WindowX11( is configured but not plugged in. */ -static int ApplicationErrorHandler(Display *display, XErrorEvent *theEvent) { +static int ApplicationErrorHandler(Display *display, XErrorEvent *theEvent) +{ fprintf(stderr, "Ignoring Xlib error: error code %d request code %d\n", theEvent->error_code, theEvent->request_code) ; diff --git a/intern/smoke/intern/smoke_API.cpp b/intern/smoke/intern/smoke_API.cpp index f34051dea76..a2f3c21bbbf 100644 --- a/intern/smoke/intern/smoke_API.cpp +++ b/intern/smoke/intern/smoke_API.cpp @@ -211,7 +211,8 @@ extern "C" void smoke_initWaveletBlenderRNA(WTURBULENCE *wt, float *strength) wt->initBlenderRNA(strength); } -template < class T > inline T ABS( T a ) { +template < class T > inline T ABS( T a ) +{ return (0 < a) ? a : -a ; } |