[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [49109] trunk/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Sun Jul 22 00:58:09 CEST 2012
Revision: 49109
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=49109
Author: campbellbarton
Date: 2012-07-21 22:58:08 +0000 (Sat, 21 Jul 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/intern/cycles/subd/subd_build.cpp
trunk/blender/intern/decimation/intern/LOD_QuadricEditor.cpp
trunk/blender/intern/decimation/intern/future/LOD_NdQuadricEditor.cpp
trunk/blender/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
trunk/blender/intern/ghost/intern/GHOST_DropTargetX11.cpp
trunk/blender/intern/ghost/intern/GHOST_SystemPathsX11.cpp
trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
trunk/blender/intern/ghost/intern/GHOST_WindowNULL.h
trunk/blender/intern/ghost/intern/GHOST_WindowWin32.cpp
trunk/blender/intern/ghost/intern/GHOST_WindowX11.cpp
trunk/blender/source/blender/blenkernel/intern/collision.c
trunk/blender/source/blender/blenkernel/intern/mask.c
trunk/blender/source/blender/collada/AnimationImporter.cpp
trunk/blender/source/blender/collada/GeometryExporter.cpp
trunk/blender/source/blender/compositor/intern/COM_MemoryBuffer.h
trunk/blender/source/blender/compositor/intern/COM_OpenCLDevice.h
trunk/blender/source/blender/compositor/operations/COM_BokehBlurOperation.cpp
trunk/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
trunk/blender/source/gameengine/Converter/BL_MeshDeformer.h
trunk/blender/source/gameengine/Expressions/ListValue.h
trunk/blender/source/gameengine/Expressions/VoidValue.h
trunk/blender/source/gameengine/GameLogic/SCA_IObject.cpp
trunk/blender/source/gameengine/GamePlayer/common/GPC_Canvas.h
trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
trunk/blender/source/gameengine/Ketsji/KX_GameObject.cpp
trunk/blender/source/gameengine/Ketsji/KX_PyMath.h
trunk/blender/source/gameengine/Ketsji/KX_WorldInfo.h
trunk/blender/source/gameengine/Physics/common/PHY_IPhysicsEnvironment.h
trunk/blender/source/gameengine/Rasterizer/RAS_Deformer.h
trunk/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
trunk/blender/source/gameengine/Rasterizer/RAS_IRasterizer.h
trunk/blender/source/gameengine/Rasterizer/RAS_MaterialBucket.h
trunk/blender/source/gameengine/Rasterizer/RAS_MeshObject.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_ListRasterizer.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.cpp
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_OpenGLRasterizer.h
trunk/blender/source/gameengine/Rasterizer/RAS_OpenGLRasterizer/RAS_VAOpenGLRasterizer.h
trunk/blender/source/gameengine/SceneGraph/SG_BBox.cpp
trunk/blender/source/gameengine/SceneGraph/SG_Spatial.cpp
trunk/blender/source/gameengine/SceneGraph/SG_Tree.cpp
trunk/blender/source/gameengine/VideoTexture/ImageBase.cpp
trunk/blender/source/gameengine/VideoTexture/ImageRender.cpp
trunk/blender/source/gameengine/VideoTexture/Texture.cpp
Modified: trunk/blender/intern/cycles/subd/subd_build.cpp
===================================================================
--- trunk/blender/intern/cycles/subd/subd_build.cpp 2012-07-21 19:21:12 UTC (rev 49108)
+++ trunk/blender/intern/cycles/subd/subd_build.cpp 2012-07-21 22:58:08 UTC (rev 49109)
@@ -117,7 +117,7 @@
memcpy(patch->hull, position, sizeof(float3)*20);
return patch;
}
- else if(face->num_edges() == 4) {
+ else if(face->num_edges() == 4) {
GregoryQuadPatch *patch = new GregoryQuadPatch();
memcpy(patch->hull, position, sizeof(float3)*20);
return patch;
@@ -644,7 +644,7 @@
hull = lpatch->hull;
patch = lpatch;
}
- else if(face->num_edges() == 4) {
+ else if(face->num_edges() == 4) {
LinearQuadPatch *lpatch = new LinearQuadPatch();
hull = lpatch->hull;
patch = lpatch;
Modified: trunk/blender/intern/decimation/intern/LOD_QuadricEditor.cpp
===================================================================
--- trunk/blender/intern/decimation/intern/LOD_QuadricEditor.cpp 2012-07-21 19:21:12 UTC (rev 49108)
+++ trunk/blender/intern/decimation/intern/LOD_QuadricEditor.cpp 2012-07-21 22:58:08 UTC (rev 49109)
@@ -174,7 +174,7 @@
vector<LOD_Edge>::iterator edge_it = edges.begin();
vector<LOD_Edge>::const_iterator edge_end = edges.end();
- for (; edge_it != edge_end; ++edge_it) {
+ for (; edge_it != edge_end; ++edge_it) {
MT_Vector3 target = TargetVertex(*edge_it);
@@ -235,7 +235,7 @@
vector<LOD_EdgeInd>::const_iterator edge_it = edges.begin();
vector<LOD_EdgeInd>::const_iterator edge_end = edges.end();
- for (; edge_it != edge_end; ++edge_it) {
+ for (; edge_it != edge_end; ++edge_it) {
MT_Vector3 target = TargetVertex(edge_set[*edge_it]);
Modified: trunk/blender/intern/decimation/intern/future/LOD_NdQuadricEditor.cpp
===================================================================
--- trunk/blender/intern/decimation/intern/future/LOD_NdQuadricEditor.cpp 2012-07-21 19:21:12 UTC (rev 49108)
+++ trunk/blender/intern/decimation/intern/future/LOD_NdQuadricEditor.cpp 2012-07-21 22:58:08 UTC (rev 49109)
@@ -204,7 +204,7 @@
TNT::Vector<MT_Scalar> target(6,MT_Scalar(0));
- for (; edge_it != edge_end; ++edge_it) {
+ for (; edge_it != edge_end; ++edge_it) {
TargetVertex(*edge_it,target,color_editor);
LOD_Edge &e = *edge_it;
@@ -295,7 +295,7 @@
TNT::Vector<MT_Scalar> target(6,MT_Scalar(0));
- for (; edge_it != edge_end; ++edge_it) {
+ for (; edge_it != edge_end; ++edge_it) {
TargetVertex(edge_set[*edge_it],target,color_editor);
Modified: trunk/blender/intern/ghost/intern/GHOST_DisplayManagerX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_DisplayManagerX11.cpp 2012-07-21 19:21:12 UTC (rev 49108)
+++ trunk/blender/intern/ghost/intern/GHOST_DisplayManagerX11.cpp 2012-07-21 22:58:08 UTC (rev 49109)
@@ -48,7 +48,7 @@
GHOST_DisplayManager(),
m_system(system)
{
- //nothing to do.
+ /* nothing to do. */
}
GHOST_TSuccess
@@ -87,7 +87,7 @@
XF86VidModeGetAllModeLines(dpy, DefaultScreen(dpy), &numSettings, &vidmodes);
#else
- // We only have one X11 setting at the moment.
+ /* We only have one X11 setting at the moment. */
GHOST_ASSERT(display < 1, "Only single display systems are currently supported.\n");
numSettings = GHOST_TInt32(1);
#endif
@@ -144,8 +144,8 @@
setting.bpp = DefaultDepth(x_display, DefaultScreen(x_display));
#endif
- // Don't think it's possible to get this value from X!
- // So let's guess!!
+ /* Don't think it's possible to get this value from X!
+ * So let's guess!! */
setting.frequency = 60;
return GHOST_kSuccess;
@@ -171,11 +171,10 @@
const GHOST_DisplaySetting& setting)
{
#ifdef WITH_X11_XF86VMODE
- //
- // Mode switching code ported from Quake 2:
- // ftp://ftp.idsoftware.com/idstuff/source/q2source-3.21.zip
- // See linux/gl_glx.c:GLimp_SetMode
- //
+ /* Mode switching code ported from Quake 2:
+ * ftp:/* ftp.idsoftware.com/idstuff/source/q2source-3.21.zip */
+ * See linux/gl_glx.c:GLimp_SetMode
+ */
int majorVersion, minorVersion;
XF86VidModeModeInfo **vidmodes;
Display *dpy = m_system->getXDisplay();
@@ -187,7 +186,7 @@
scrnum = DefaultScreen(dpy);
- // Get video mode list
+ /* Get video mode list */
majorVersion = minorVersion = 0;
if (!XF86VidModeQueryVersion(dpy, &majorVersion, &minorVersion)) {
fprintf(stderr, "Error: XF86VidMode extension missing!\n");
@@ -228,20 +227,21 @@
actualWidth, actualHeight);
# endif
- // change to the mode
+ /* change to the mode */
XF86VidModeSwitchToMode(dpy, scrnum, vidmodes[best_fit]);
- // Move the viewport to top left
+ /* Move the viewport to top left */
XF86VidModeSetViewPort(dpy, scrnum, 0, 0);
}
- else
+ else {
return GHOST_kFailure;
+ }
XFlush(dpy);
return GHOST_kSuccess;
#else
- // Just pretend the request was successful.
+ /* Just pretend the request was successful. */
return GHOST_kSuccess;
#endif
}
Modified: trunk/blender/intern/ghost/intern/GHOST_DropTargetX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_DropTargetX11.cpp 2012-07-21 19:21:12 UTC (rev 49108)
+++ trunk/blender/intern/ghost/intern/GHOST_DropTargetX11.cpp 2012-07-21 22:58:08 UTC (rev 49109)
@@ -144,23 +144,23 @@
break;
}
- // We are now converting
+ /* We are now converting */
state = STATE_CONVERTING;
break;
case STATE_CONVERTING:
bothDigits = true;
- // Create a buffer to hold the hex. For example, if %20, this
- // buffer would hold 20 (in ASCII)
+ /* Create a buffer to hold the hex. For example, if %20, this
+ * buffer would hold 20 (in ASCII) */
memset(tempNumBuf, 0, sizeof(tempNumBuf));
- // Conversion complete (i.e. don't convert again next iter)
+ /* Conversion complete (i.e. don't convert again next iter) */
state = STATE_SEARCH;
strncpy(tempNumBuf, &encodedIn[i], 2);
- // Ensure both characters are hexadecimal
+ /* Ensure both characters are hexadecimal */
for (j = 0; j < 2; ++j) {
if (!isxdigit(tempNumBuf[j]))
@@ -170,16 +170,16 @@
if (!bothDigits)
break;
- // Convert two hexadecimal characters into one character
+ /* Convert two hexadecimal characters into one character */
sscanf(tempNumBuf, "%x", &asciiCharacter);
- // Ensure we aren't going to overflow
+ /* Ensure we aren't going to overflow */
assert(strlen(decodedOut) < bufferSize);
- // Concatenate this character onto the output
+ /* Concatenate this character onto the output */
strncat(decodedOut, (char *)&asciiCharacter, 1);
- // Skip the next character
+ /* Skip the next character */
i++;
break;
}
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemPathsX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemPathsX11.cpp 2012-07-21 19:21:12 UTC (rev 49108)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemPathsX11.cpp 2012-07-21 22:58:08 UTC (rev 49109)
@@ -38,11 +38,11 @@
#include <sys/time.h>
#include <unistd.h>
-#include <stdio.h> // for fprintf only
-#include <cstdlib> // for exit
+#include <stdio.h> /* for fprintf only */
+#include <cstdlib> /* for exit */
-#include <pwd.h> // for get home without use getenv()
-#include <limits.h> // for PATH_MAX
+#include <pwd.h> /* for get home without use getenv() */
+#include <limits.h> /* for PATH_MAX */
#ifdef PREFIX
static const char *static_path = PREFIX "/share";
Modified: trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp
===================================================================
--- trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp 2012-07-21 19:21:12 UTC (rev 49108)
+++ trunk/blender/intern/ghost/intern/GHOST_SystemX11.cpp 2012-07-21 22:58:08 UTC (rev 49109)
@@ -32,7 +32,6 @@
* \ingroup GHOST
*/
-
#include "GHOST_SystemX11.h"
#include "GHOST_WindowX11.h"
#include "GHOST_WindowManager.h"
@@ -44,11 +43,11 @@
#include "GHOST_DisplayManagerX11.h"
#include "GHOST_EventDragnDrop.h"
#ifdef WITH_INPUT_NDOF
-#include "GHOST_NDOFManagerX11.h"
+# include "GHOST_NDOFManagerX11.h"
#endif
#ifdef WITH_XDND
-#include "GHOST_DropTargetX11.h"
+# include "GHOST_DropTargetX11.h"
#endif
#include "GHOST_Debug.h"
@@ -61,20 +60,19 @@
#include <X11/XF86keysym.h>
#endif
-// For timing
-
+/* For timing */
#include <sys/time.h>
#include <unistd.h>
#include <iostream>
#include <vector>
-#include <stdio.h> // for fprintf only
-#include <cstdlib> // for exit
+#include <stdio.h> /* for fprintf only */
+#include <cstdlib> /* for exit */
static GHOST_TKey
convertXKey(KeySym key);
-//these are for copy and select copy
+/* these are for copy and select copy */
static char *txt_cut_buffer = NULL;
static char *txt_select_buffer = NULL;
@@ -90,7 +88,7 @@
if (!m_display) {
std::cerr << "Unable to open a display" << std::endl;
- abort(); //was return before, but this would just mean it will crash later
+ abort(); /* was return before, but this would just mean it will crash later */
}
#if defined(WITH_X11_XINPUT) && defined(X_HAVE_UTF8_STRING)
@@ -128,13 +126,13 @@
m_last_warp = 0;
- // compute the initial time
+ /* compute the initial time */
timeval tv;
if (gettimeofday(&tv, NULL) == -1) {
GHOST_ASSERT(false, "Could not instantiate timer!");
}
- // Taking care not to overflow the tv.tv_sec*1000
+ /* Taking care not to overflow the tv.tv_sec*1000 */
m_start_time = GHOST_TUns64(tv.tv_sec) * 1000 + tv.tv_usec / 1000;
@@ -190,7 +188,7 @@
GHOST_ASSERT(false, "Could not compute time!");
}
- // Taking care not to overflow the tv.tv_sec*1000
+ /* Taking care not to overflow the tv.tv_sec*1000 */
return GHOST_TUns64(tv.tv_sec) * 1000 + tv.tv_usec / 1000 - m_start_time;
}
@@ -254,16 +252,16 @@
- window = new GHOST_WindowX11(
- this, m_display, title, left, top, width, height, state, parentWindow, type, stereoVisual
- );
+ window = new GHOST_WindowX11(this, m_display, title,
+ left, top, width, height,
+ state, parentWindow, type, stereoVisual);
if (window) {
- // Both are now handle in GHOST_WindowX11.cpp
- // Focus and Delete atoms.
+ /* Both are now handle in GHOST_WindowX11.cpp
+ * Focus and Delete atoms. */
if (window->getValid()) {
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list