[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48007] trunk/blender: style cleanup:
Campbell Barton
ideasman42 at gmail.com
Sun Jun 17 11:58:31 CEST 2012
Revision: 48007
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48007
Author: campbellbarton
Date: 2012-06-17 09:58:26 +0000 (Sun, 17 Jun 2012)
Log Message:
-----------
style cleanup:
also fix for building ghost test and fix double free in one of the tests
Modified Paths:
--------------
trunk/blender/extern/recastnavigation/recast-capi.cpp
trunk/blender/intern/bsp/test/BSP_GhostTest/plyfile.c
trunk/blender/intern/elbeem/intern/controlparticles.cpp
trunk/blender/intern/ghost/intern/GHOST_SystemWin32.cpp
trunk/blender/intern/ghost/test/gears/GHOST_C-Test.c
trunk/blender/intern/ghost/test/gears/GHOST_Test.cpp
trunk/blender/intern/memutil/intern/MEM_CacheLimiterC-Api.cpp
trunk/blender/source/blender/avi/intern/avi.c
trunk/blender/source/blender/blenkernel/intern/CCGSubSurf.c
trunk/blender/source/blender/blenkernel/intern/cloth.c
trunk/blender/source/blender/blenkernel/intern/collision.c
trunk/blender/source/blender/blenkernel/intern/curve.c
trunk/blender/source/blender/blenkernel/intern/implicit.c
trunk/blender/source/blender/blenkernel/intern/lattice.c
trunk/blender/source/blender/blenkernel/intern/mesh.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenkernel/intern/smoke.c
trunk/blender/source/blender/blenlib/intern/string_utf8.c
trunk/blender/source/blender/blenlib/intern/threads.c
trunk/blender/source/blender/blenlib/intern/voronoi.c
trunk/blender/source/blender/collada/AnimationExporter.cpp
trunk/blender/source/blender/collada/MaterialExporter.cpp
trunk/blender/source/blender/compositor/intern/COM_WorkScheduler.cpp
trunk/blender/source/blender/compositor/operations/COM_DoubleEdgeMaskOperation.cpp
trunk/blender/source/blender/editors/animation/keyframes_general.c
trunk/blender/source/blender/editors/interface/interface_draw.c
trunk/blender/source/blender/editors/interface/interface_icons.c
trunk/blender/source/blender/editors/interface/resources.c
trunk/blender/source/blender/editors/object/object_lattice.c
trunk/blender/source/blender/editors/screen/screen_ops.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/space_image/space_image.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/space_text/text_draw.c
trunk/blender/source/blender/editors/space_view3d/drawvolume.c
trunk/blender/source/blender/editors/space_view3d/view3d_edit.c
trunk/blender/source/blender/editors/transform/transform_snap.c
trunk/blender/source/blender/gpu/intern/gpu_draw.c
trunk/blender/source/blender/makesrna/intern/rna_nodetree_types.h
trunk/blender/source/blender/makesrna/intern/rna_smoke.c
trunk/blender/source/blender/makesrna/intern/rna_tracking.c
trunk/blender/source/blender/nodes/composite/nodes/node_composite_mask.c
trunk/blender/source/blender/nodes/shader/nodes/node_shader_particle_info.c
trunk/blender/source/blender/nodes/texture/node_texture_util.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_coord.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_hueSatVal.c
trunk/blender/source/blender/nodes/texture/nodes/node_texture_texture.c
trunk/blender/source/blender/python/mathutils/mathutils_Vector.c
trunk/blender/source/blender/render/intern/source/volumetric.c
trunk/blender/source/blender/render/intern/source/zbuf.c
trunk/blender/source/blender/windowmanager/intern/wm_operators.c
trunk/blender/source/blender/windowmanager/intern/wm_window.c
trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
trunk/blender/source/gameengine/Expressions/PyObjectPlus.h
trunk/blender/source/gameengine/GameLogic/SCA_ILogicBrick.h
trunk/blender/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
trunk/blender/source/gameengine/Ketsji/BL_Shader.cpp
trunk/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
trunk/blender/source/gameengine/Ketsji/KX_BulletPhysicsController.h
trunk/blender/source/gameengine/Ketsji/KX_Dome.cpp
trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
trunk/blender/source/gameengine/Ketsji/KX_PyMath.h
trunk/blender/source/gameengine/Ketsji/KX_RadarSensor.cpp
trunk/blender/source/gameengine/Ketsji/KX_SCA_AddObjectActuator.cpp
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
Modified: trunk/blender/extern/recastnavigation/recast-capi.cpp
===================================================================
--- trunk/blender/extern/recastnavigation/recast-capi.cpp 2012-06-17 07:59:22 UTC (rev 48006)
+++ trunk/blender/extern/recastnavigation/recast-capi.cpp 2012-06-17 09:58:26 UTC (rev 48007)
@@ -278,7 +278,7 @@
#define min(a, b) (a) < (b) ? a : b
#define swapcode(TYPE, parmi, parmj, n) \
{ \
- long i = (n) / sizeof (TYPE); \
+ long i = (n) / sizeof(TYPE); \
TYPE *pi = (TYPE *) (parmi); \
TYPE *pj = (TYPE *) (parmj); \
do { \
Modified: trunk/blender/intern/bsp/test/BSP_GhostTest/plyfile.c
===================================================================
--- trunk/blender/intern/bsp/test/BSP_GhostTest/plyfile.c 2012-06-17 07:59:22 UTC (rev 48006)
+++ trunk/blender/intern/bsp/test/BSP_GhostTest/plyfile.c 2012-06-17 09:58:26 UTC (rev 48007)
@@ -28,37 +28,37 @@
/*
-The interface routines for reading and writing PLY polygon files.
+ The interface routines for reading and writing PLY polygon files.
-Greg Turk, February 1994
+ Greg Turk, February 1994
----------------------------------------------------------------
+ ---------------------------------------------------------------
-A PLY file contains a single polygonal _object_.
+ A PLY file contains a single polygonal _object_.
-An object is composed of lists of _elements_. Typical elements are
-vertices, faces, edges and materials.
+ An object is composed of lists of _elements_. Typical elements are
+ vertices, faces, edges and materials.
-Each type of element for a given object has one or more _properties_
-associated with the element type. For instance, a vertex element may
-have as properties the floating-point values x,y,z and the three unsigned
-chars representing red, green and blue.
+ Each type of element for a given object has one or more _properties_
+ associated with the element type. For instance, a vertex element may
+ have as properties the floating-point values x,y,z and the three unsigned
+ chars representing red, green and blue.
----------------------------------------------------------------
+ ---------------------------------------------------------------
-Copyright (c) 1994 The Board of Trustees of The Leland Stanford
-Junior University. All rights reserved.
+ Copyright (c) 1994 The Board of Trustees of The Leland Stanford
+ Junior University. All rights reserved.
-Permission to use, copy, modify and distribute this software and its
-documentation for any purpose is hereby granted without fee, provided
-that the above copyright notice and this permission notice appear in
-all copies of this software and that you do not sell the software.
+ Permission to use, copy, modify and distribute this software and its
+ documentation for any purpose is hereby granted without fee, provided
+ that the above copyright notice and this permission notice appear in
+ all copies of this software and that you do not sell the software.
-THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
-EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
-WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
+ THE SOFTWARE IS PROVIDED "AS IS" AND WITHOUT WARRANTY OF ANY KIND,
+ EXPRESS, IMPLIED OR OTHERWISE, INCLUDING WITHOUT LIMITATION, ANY
+ WARRANTY OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE.
-*/
+ */
#include <stdio.h>
#include <stdlib.h>
@@ -67,14 +67,14 @@
#include "ply.h"
char *type_names[] = {
-"invalid",
-"char", "short", "int",
-"uchar", "ushort", "uint",
-"float", "double",
+ "invalid",
+ "char", "short", "int",
+ "uchar", "ushort", "uint",
+ "float", "double",
};
int ply_type_size[] = {
- 0, 1, 2, 4, 1, 2, 4, 4, 8
+ 0, 1, 2, 4, 1, 2, 4, 4, 8
};
#define NO_OTHER_PROPS -1
@@ -96,7 +96,7 @@
PlyProperty *find_property(PlyElement *, char *, int *);
/* write to a file the word describing a PLY file data type */
-void write_scalar_type (FILE *, int);
+void write_scalar_type(FILE *, int);
/* read a line from a file and break it up into separate words */
char **get_words(FILE *, int *, char **);
@@ -120,7 +120,7 @@
void store_item(char *, int, int, unsigned int, double);
/* return the value of a stored item */
-void get_stored_item( void *, int, int *, unsigned int *, double *);
+void get_stored_item(void *, int, int *, unsigned int *, double *);
/* return the value stored in an item, given ptr to it and its type */
double get_item_value(char *, int);
@@ -143,551 +143,551 @@
/******************************************************************************
-Given a file pointer, get ready to write PLY data to the file.
+ Given a file pointer, get ready to write PLY data to the file.
-Entry:
- fp - the given file pointer
- nelems - number of elements in object
- elem_names - list of element names
- file_type - file type, either ascii or binary
+ Entry:
+ fp - the given file pointer
+ nelems - number of elements in object
+ elem_names - list of element names
+ file_type - file type, either ascii or binary
-Exit:
- returns a pointer to a PlyFile, used to refer to this file, or NULL if error
+ Exit:
+ returns a pointer to a PlyFile, used to refer to this file, or NULL if error
******************************************************************************/
PlyFile *ply_write(
- FILE *fp,
- int nelems,
- char **elem_names,
- int file_type
-)
+ FILE *fp,
+ int nelems,
+ char **elem_names,
+ int file_type
+ )
{
- int i;
- PlyFile *plyfile;
- PlyElement *elem;
+ int i;
+ PlyFile *plyfile;
+ PlyElement *elem;
- /* check for NULL file pointer */
- if (fp == NULL)
- return (NULL);
+ /* check for NULL file pointer */
+ if (fp == NULL)
+ return (NULL);
- /* create a record for this object */
+ /* create a record for this object */
- plyfile = (PlyFile *) myalloc (sizeof (PlyFile));
- plyfile->file_type = file_type;
- plyfile->num_comments = 0;
- plyfile->num_obj_info = 0;
- plyfile->nelems = nelems;
- plyfile->version = 1.0;
- plyfile->fp = fp;
- plyfile->other_elems = NULL;
+ plyfile = (PlyFile *) myalloc(sizeof(PlyFile));
+ plyfile->file_type = file_type;
+ plyfile->num_comments = 0;
+ plyfile->num_obj_info = 0;
+ plyfile->nelems = nelems;
+ plyfile->version = 1.0;
+ plyfile->fp = fp;
+ plyfile->other_elems = NULL;
- /* tuck aside the names of the elements */
+ /* tuck aside the names of the elements */
- plyfile->elems = (PlyElement **) myalloc (sizeof (PlyElement *) * nelems);
- for (i = 0; i < nelems; i++) {
- elem = (PlyElement *) myalloc (sizeof (PlyElement));
- plyfile->elems[i] = elem;
- elem->name = strdup (elem_names[i]);
- elem->num = 0;
- elem->nprops = 0;
- }
+ plyfile->elems = (PlyElement **) myalloc(sizeof(PlyElement *) * nelems);
+ for (i = 0; i < nelems; i++) {
+ elem = (PlyElement *) myalloc(sizeof(PlyElement));
+ plyfile->elems[i] = elem;
+ elem->name = strdup(elem_names[i]);
+ elem->num = 0;
+ elem->nprops = 0;
+ }
- /* return pointer to the file descriptor */
- return (plyfile);
+ /* return pointer to the file descriptor */
+ return (plyfile);
}
/******************************************************************************
-Open a polygon file for writing.
+ Open a polygon file for writing.
-Entry:
- filename - name of file to read from
- nelems - number of elements in object
- elem_names - list of element names
- file_type - file type, either ascii or binary
+ Entry:
+ filename - name of file to read from
+ nelems - number of elements in object
+ elem_names - list of element names
+ file_type - file type, either ascii or binary
-Exit:
- version - version number of PLY file
- returns a file identifier, used to refer to this file, or NULL if error
+ Exit:
+ version - version number of PLY file
+ returns a file identifier, used to refer to this file, or NULL if error
******************************************************************************/
PlyFile *ply_open_for_writing(
- char *filename,
- int nelems,
- char **elem_names,
- int file_type,
- float *version
-)
+ char *filename,
+ int nelems,
+ char **elem_names,
+ int file_type,
+ float *version
+ )
{
- PlyFile *plyfile;
- char *name;
- FILE *fp;
+ PlyFile *plyfile;
+ char *name;
+ FILE *fp;
- /* tack on the extension .ply, if necessary */
+ /* tack on the extension .ply, if necessary */
- name = (char *) myalloc (sizeof (char) * (strlen (filename) + 5));
- strcpy (name, filename);
- if (strlen (name) < 4 ||
- strcmp (name + strlen (name) - 4, ".ply") != 0)
- strcat (name, ".ply");
+ name = (char *) myalloc(sizeof(char) * (strlen(filename) + 5));
+ strcpy(name, filename);
+ if (strlen(name) < 4 ||
+ strcmp(name + strlen(name) - 4, ".ply") != 0)
+ strcat(name, ".ply");
- /* open the file for writing */
+ /* open the file for writing */
- fp = fopen (name, "w");
- if (fp == NULL) {
- return (NULL);
- }
+ fp = fopen(name, "w");
+ if (fp == NULL) {
+ return (NULL);
+ }
- /* create the actual PlyFile structure */
+ /* create the actual PlyFile structure */
- plyfile = ply_write (fp, nelems, elem_names, file_type);
- if (plyfile == NULL)
- return (NULL);
+ plyfile = ply_write(fp, nelems, elem_names, file_type);
+ if (plyfile == NULL)
+ return (NULL);
- /* say what PLY file version number we're writing */
- *version = plyfile->version;
+ /* say what PLY file version number we're writing */
+ *version = plyfile->version;
- /* return pointer to the file descriptor */
- return (plyfile);
+ /* return pointer to the file descriptor */
+ return (plyfile);
}
/******************************************************************************
-Describe an element, including its properties and how many will be written
-to the file.
+ Describe an element, including its properties and how many will be written
+ to the file.
-Entry:
- plyfile - file identifier
- elem_name - name of element that information is being specified about
- nelems - number of elements of this type to be written
- nprops - number of properties contained in the element
- prop_list - list of properties
+ Entry:
+ plyfile - file identifier
+ elem_name - name of element that information is being specified about
+ nelems - number of elements of this type to be written
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list