[Bf-blender-cvs] [a55b71b] soc-2014-viewport_context: Style cleanup & no need for static vars here

Campbell Barton noreply at git.blender.org
Sat Jul 26 07:08:35 CEST 2014


Commit: a55b71b4378c5eb826b123b6a750e12c747f683f
Author: Campbell Barton
Date:   Sat Jul 26 15:07:51 2014 +1000
Branches: soc-2014-viewport_context
https://developer.blender.org/rBa55b71b4378c5eb826b123b6a750e12c747f683f

Style cleanup & no need for static vars here

===================================================================

M	intern/ghost/intern/GHOST_ContextGLX.cpp
M	intern/ghost/intern/GHOST_ContextWGL.cpp
M	intern/ghost/intern/GHOST_Window.h
M	intern/ghost/intern/GHOST_WindowCocoa.h
M	intern/ghost/intern/GHOST_WindowWin32.cpp
M	intern/ghost/intern/GHOST_WindowWin32.h
M	intern/ghost/intern/GHOST_WindowX11.cpp
M	intern/ghost/intern/GHOST_WindowX11.h

===================================================================

diff --git a/intern/ghost/intern/GHOST_ContextGLX.cpp b/intern/ghost/intern/GHOST_ContextGLX.cpp
index 8cc66dc..12d76ce 100644
--- a/intern/ghost/intern/GHOST_ContextGLX.cpp
+++ b/intern/ghost/intern/GHOST_ContextGLX.cpp
@@ -163,15 +163,15 @@ GHOST_TSuccess GHOST_ContextGLX::initializeDrawingContext()
 	}
 
 #ifdef GHOST_OPENGL_ALPHA
-	static const bool needAlpha   = true;
+	const bool needAlpha = true;
 #else
-	static const bool needAlpha   = false;
+	const bool needAlpha = false;
 #endif
 
 #ifdef GHOST_OPENGL_STENCIL
-	static const bool needStencil = true;
+	const bool needStencil = true;
 #else
-	static const bool needStencil = false;
+	const bool needStencil = false;
 #endif
 
 	/* Find the display with highest samples, starting at level requested */
diff --git a/intern/ghost/intern/GHOST_ContextWGL.cpp b/intern/ghost/intern/GHOST_ContextWGL.cpp
index 9581830..27cd946 100644
--- a/intern/ghost/intern/GHOST_ContextWGL.cpp
+++ b/intern/ghost/intern/GHOST_ContextWGL.cpp
@@ -566,11 +566,11 @@ int GHOST_ContextWGL::_choose_pixel_format_arb_1(
 
 
 int GHOST_ContextWGL::choose_pixel_format_arb(
-	bool stereoVisual,
-	int numOfAASamples,
-	bool needAlpha,
-	bool needStencil,
-	bool sRGB)
+        bool stereoVisual,
+        int numOfAASamples,
+        bool needAlpha,
+        bool needStencil,
+        bool sRGB)
 {
 	int iPixelFormat;
 	int swapMethodOut;
@@ -684,15 +684,15 @@ GHOST_TSuccess GHOST_ContextWGL::initializeDrawingContext()
 	WIN32_CHK(GetLastError() == NO_ERROR);
 
 #ifdef GHOST_OPENGL_ALPHA
-	static const bool needAlpha   = true;
+	const bool needAlpha = true;
 #else
-	static const bool needAlpha   = false;
+	const bool needAlpha = false;
 #endif
 
 #ifdef GHOST_OPENGL_STENCIL
-	static const bool needStencil = true;
+	const bool needStencil = true;
 #else
-	static const bool needStencil = false;
+	const bool needStencil = false;
 #endif
 
 #ifdef GHOST_OPENGL_SRGB
diff --git a/intern/ghost/intern/GHOST_Window.h b/intern/ghost/intern/GHOST_Window.h
index 6d06437..e470e40 100644
--- a/intern/ghost/intern/GHOST_Window.h
+++ b/intern/ghost/intern/GHOST_Window.h
@@ -301,7 +301,7 @@ protected:
 	 * \param type	The type of rendering context installed.
 	 * \return Indication as to whether installation has succeeded.
 	 */
-	virtual GHOST_Context* newDrawingContext(GHOST_TDrawingContextType type) = 0;
+	virtual GHOST_Context *newDrawingContext(GHOST_TDrawingContextType type) = 0;
 
 	/**
 	 * Sets the cursor visibility on the window using
diff --git a/intern/ghost/intern/GHOST_WindowCocoa.h b/intern/ghost/intern/GHOST_WindowCocoa.h
index a11e78d..03c7b42 100644
--- a/intern/ghost/intern/GHOST_WindowCocoa.h
+++ b/intern/ghost/intern/GHOST_WindowCocoa.h
@@ -266,7 +266,7 @@ protected:
 	 * \param type	The type of rendering context create.
 	 * \return Indication of success.
 	 */
-	virtual GHOST_Context* newDrawingContext(GHOST_TDrawingContextType type);
+	virtual GHOST_Context *newDrawingContext(GHOST_TDrawingContextType type);
 
 	/**
 	 * Invalidates the contents of this window.
diff --git a/intern/ghost/intern/GHOST_WindowWin32.cpp b/intern/ghost/intern/GHOST_WindowWin32.cpp
index e6eb457..2b3abf0 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.cpp
+++ b/intern/ghost/intern/GHOST_WindowWin32.cpp
@@ -603,7 +603,7 @@ GHOST_TSuccess GHOST_WindowWin32::invalidate()
 
 
 
-GHOST_Context* GHOST_WindowWin32::newDrawingContext(GHOST_TDrawingContextType type)
+GHOST_Context *GHOST_WindowWin32::newDrawingContext(GHOST_TDrawingContextType type)
 {
 	if (type == GHOST_kDrawingContextTypeOpenGL) {
 #if !defined(WITH_GL_EGL)
diff --git a/intern/ghost/intern/GHOST_WindowWin32.h b/intern/ghost/intern/GHOST_WindowWin32.h
index beebfb7..965a4cb 100644
--- a/intern/ghost/intern/GHOST_WindowWin32.h
+++ b/intern/ghost/intern/GHOST_WindowWin32.h
@@ -259,7 +259,7 @@ private:
 	 * \param type	The type of rendering context create.
 	 * \return Indication of success.
 	 */
-	virtual GHOST_Context* newDrawingContext(GHOST_TDrawingContextType type);
+	virtual GHOST_Context *newDrawingContext(GHOST_TDrawingContextType type);
 
 	/**
 	 * Sets the cursor visibility on the window using
diff --git a/intern/ghost/intern/GHOST_WindowX11.cpp b/intern/ghost/intern/GHOST_WindowX11.cpp
index ac23949..275aa47 100644
--- a/intern/ghost/intern/GHOST_WindowX11.cpp
+++ b/intern/ghost/intern/GHOST_WindowX11.cpp
@@ -1085,7 +1085,7 @@ GHOST_WindowX11::
 
 
 
-GHOST_Context* GHOST_WindowX11::newDrawingContext(GHOST_TDrawingContextType type)
+GHOST_Context *GHOST_WindowX11::newDrawingContext(GHOST_TDrawingContextType type)
 {
 	if (type == GHOST_kDrawingContextTypeOpenGL) {
 #if !defined(WITH_GL_EGL)
diff --git a/intern/ghost/intern/GHOST_WindowX11.h b/intern/ghost/intern/GHOST_WindowX11.h
index 39bb4e3..6a012f1 100644
--- a/intern/ghost/intern/GHOST_WindowX11.h
+++ b/intern/ghost/intern/GHOST_WindowX11.h
@@ -232,7 +232,7 @@ protected:
 	 * \param type	The type of rendering context create.
 	 * \return Indication of success.
 	 */
-	virtual GHOST_Context* newDrawingContext(GHOST_TDrawingContextType type);
+	virtual GHOST_Context *newDrawingContext(GHOST_TDrawingContextType type);
 
 	/**
 	 * Sets the cursor visibility on the window using




More information about the Bf-blender-cvs mailing list