[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47546] trunk/blender: style cleanup

Campbell Barton ideasman42 at gmail.com
Thu Jun 7 00:38:39 CEST 2012


Revision: 47546
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47546
Author:   campbellbarton
Date:     2012-06-06 22:38:39 +0000 (Wed, 06 Jun 2012)
Log Message:
-----------
style cleanup

Modified Paths:
--------------
    trunk/blender/intern/container/CTR_UHeap.h
    trunk/blender/intern/cycles/util/util_system.cpp
    trunk/blender/intern/ghost/GHOST_Types.h
    trunk/blender/intern/mikktspace/mikktspace.c
    trunk/blender/intern/mikktspace/mikktspace.h
    trunk/blender/source/blender/blenkernel/BKE_cloth.h
    trunk/blender/source/blender/blenkernel/BKE_collision.h
    trunk/blender/source/blender/blenkernel/BKE_node.h
    trunk/blender/source/blender/blenkernel/BKE_sketch.h
    trunk/blender/source/blender/blenkernel/intern/implicit.c
    trunk/blender/source/blender/blenkernel/intern/particle_system.c
    trunk/blender/source/blender/blenkernel/intern/seqcache.c
    trunk/blender/source/blender/bmesh/intern/bmesh_marking.h
    trunk/blender/source/blender/editors/armature/editarmature_retarget.c
    trunk/blender/source/blender/editors/include/ED_transform.h
    trunk/blender/source/blender/editors/space_file/filelist.c
    trunk/blender/source/blender/editors/space_file/filelist.h
    trunk/blender/source/blender/editors/space_node/node_intern.h
    trunk/blender/source/blender/editors/transform/transform_conversions.c
    trunk/blender/source/blender/editors/transform/transform_ops.c
    trunk/blender/source/blender/gpu/shaders/gpu_shader_material.glsl
    trunk/blender/source/blender/imbuf/intern/openexr/openexr_api.cpp
    trunk/blender/source/blender/makesdna/DNA_actuator_types.h
    trunk/blender/source/blender/makesdna/DNA_cloth_types.h
    trunk/blender/source/blender/makesdna/DNA_listBase.h
    trunk/blender/source/blender/makesdna/DNA_particle_types.h
    trunk/blender/source/blender/render/extern/include/RE_shader_ext.h
    trunk/blender/source/blender/render/intern/include/render_types.h
    trunk/blender/source/blender/render/intern/include/rendercore.h
    trunk/blender/source/blender/render/intern/include/sunsky.h
    trunk/blender/source/blender/render/intern/include/voxeldata.h
    trunk/blender/source/blender/render/intern/include/zbuf.h
    trunk/blender/source/blender/render/intern/raytrace/rayobject_instance.cpp
    trunk/blender/source/blender/render/intern/source/convertblender.c
    trunk/blender/source/blender/render/intern/source/pointdensity.c
    trunk/blender/source/blender/windowmanager/WM_types.h
    trunk/blender/source/blender/windowmanager/intern/wm_window.c
    trunk/blender/source/gameengine/Converter/BL_ArmatureObject.cpp
    trunk/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    trunk/blender/source/gameengine/Converter/BL_DeformableGameObject.cpp
    trunk/blender/source/gameengine/Converter/BL_ShapeActionActuator.cpp
    trunk/blender/source/gameengine/Expressions/PyObjectPlus.h
    trunk/blender/source/gameengine/Expressions/Value.h
    trunk/blender/source/gameengine/GameLogic/Joystick/SCA_Joystick.h
    trunk/blender/source/gameengine/GameLogic/SCA_JoystickSensor.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_JoystickSensor.h
    trunk/blender/source/gameengine/GamePlayer/ghost/GPG_ghost.cpp
    trunk/blender/source/gameengine/GamePlayer/xembed/blender_plugin_types.h
    trunk/blender/source/gameengine/Ketsji/KX_BulletPhysicsController.h
    trunk/blender/source/gameengine/Ketsji/KX_Dome.cpp
    trunk/blender/source/gameengine/Ketsji/KX_GameObject.h
    trunk/blender/source/gameengine/Ketsji/KX_IpoActuator.cpp
    trunk/blender/source/gameengine/Ketsji/KX_KetsjiEngine.h
    trunk/blender/source/gameengine/Ketsji/KX_LightIpoSGController.h
    trunk/blender/source/gameengine/Ketsji/KX_MaterialIpoController.h
    trunk/blender/source/gameengine/Ketsji/KX_ObColorIpoSGController.h
    trunk/blender/source/gameengine/Ketsji/KX_SoundActuator.h
    trunk/blender/source/gameengine/Ketsji/KX_WorldIpoController.h
    trunk/blender/source/gameengine/Rasterizer/RAS_LightObject.h
    trunk/blender/source/gameengine/SceneGraph/SG_ParentRelation.h

Modified: trunk/blender/intern/container/CTR_UHeap.h
===================================================================
--- trunk/blender/intern/container/CTR_UHeap.h	2012-06-06 22:37:28 UTC (rev 47545)
+++ trunk/blender/intern/container/CTR_UHeap.h	2012-06-06 22:38:39 UTC (rev 47546)
@@ -56,7 +56,7 @@
 public :
 		int &
 	HeapPos(
-	){
+	) {
 		return m_ind;
 	};
 		float &
@@ -93,7 +93,7 @@
 	};
 
 	~CTR_UHeapable(
-	){
+	) {
 	};
 };
 	
@@ -214,7 +214,7 @@
 		HeapType *base,
 		int i, 
 		int j
-	){
+	) {
 		std::swap(m_vector[i],m_vector[j]);
 		
 		CTR_UHeapable *heap_i = base + m_vector[i];

Modified: trunk/blender/intern/cycles/util/util_system.cpp
===================================================================
--- trunk/blender/intern/cycles/util/util_system.cpp	2012-06-06 22:37:28 UTC (rev 47545)
+++ trunk/blender/intern/cycles/util/util_system.cpp	2012-06-06 22:38:39 UTC (rev 47546)
@@ -152,7 +152,7 @@
 		/*__cpuid(result, 0x80000000);
 		num_ex = result[0];*/
 
-		if(num >= 1){
+		if(num >= 1) {
 			__cpuid(result, 0x00000001);
 			caps.mmx = (result[3] & ((int)1 << 23)) != 0;
 			caps.sse = (result[3] & ((int)1 << 25)) != 0;
@@ -167,7 +167,7 @@
 			caps.fma3 = (result[2] & ((int)1 << 12)) != 0;
 		}
 
-		/*if(num_ex >= 0x80000001){
+		/*if(num_ex >= 0x80000001) {
 			__cpuid(result, 0x80000001);
 			caps.x64 = (result[3] & ((int)1 << 29)) != 0;
 			caps.sse4a = (result[2] & ((int)1 <<  6)) != 0;

Modified: trunk/blender/intern/ghost/GHOST_Types.h
===================================================================
--- trunk/blender/intern/ghost/GHOST_Types.h	2012-06-06 22:37:28 UTC (rev 47545)
+++ trunk/blender/intern/ghost/GHOST_Types.h	2012-06-06 22:38:39 UTC (rev 47546)
@@ -56,8 +56,7 @@
 
 typedef void *GHOST_TUserDataPtr;
 
-typedef enum
-{
+typedef enum {
 	GHOST_kFailure = 0,
 	GHOST_kSuccess
 } GHOST_TSuccess;

Modified: trunk/blender/intern/mikktspace/mikktspace.c
===================================================================
--- trunk/blender/intern/mikktspace/mikktspace.c	2012-06-06 22:37:28 UTC (rev 47545)
+++ trunk/blender/intern/mikktspace/mikktspace.c	2012-06-06 22:38:39 UTC (rev 47546)
@@ -40,8 +40,7 @@
 #define INTERNAL_RND_SORT_SEED		39871946
 
 // internal structure
-typedef struct
-{
+typedef struct {
 	float x, y, z;
 } SVec3;
 
@@ -119,14 +118,12 @@
 
 
 
-typedef struct
-{
+typedef struct {
 	int iNrFaces;
 	int * pTriMembers;
 } SSubGroup;
 
-typedef struct
-{
+typedef struct {
 	int iNrFaces;
 	int * pFaceIndices;
 	int iVertexRepresentitive;
@@ -141,8 +138,7 @@
 
 
 
-typedef struct
-{
+typedef struct {
 	int FaceNeighbors[3];
 	SGroup * AssignedGroup[3];
 	
@@ -156,8 +152,7 @@
 	unsigned char vert_num[4];
 } STriInfo;
 
-typedef struct
-{
+typedef struct {
 	SVec3 vOs;
 	float fMagS;
 	SVec3 vOt;
@@ -426,8 +421,7 @@
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-typedef struct
-{
+typedef struct {
 	float vert[3];
 	int index;
 } STmpVert;
@@ -911,8 +905,7 @@
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////////////////////////////
 
-typedef union
-{
+typedef union {
 	struct
 	{
 		int i0, i1, f;

Modified: trunk/blender/intern/mikktspace/mikktspace.h
===================================================================
--- trunk/blender/intern/mikktspace/mikktspace.h	2012-06-06 22:37:28 UTC (rev 47545)
+++ trunk/blender/intern/mikktspace/mikktspace.h	2012-06-06 22:38:39 UTC (rev 47546)
@@ -62,8 +62,7 @@
 typedef int tbool;
 typedef struct SMikkTSpaceContext SMikkTSpaceContext;
 
-typedef struct
-{
+typedef struct {
 	// Returns the number of faces (triangles/quads) on the mesh to be processed.
 	int (*m_getNumFaces)(const SMikkTSpaceContext * pContext);
 

Modified: trunk/blender/source/blender/blenkernel/BKE_cloth.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_cloth.h	2012-06-06 22:37:28 UTC (rev 47545)
+++ trunk/blender/source/blender/blenkernel/BKE_cloth.h	2012-06-06 22:38:39 UTC (rev 47546)
@@ -69,8 +69,7 @@
  * own connectivity of the mesh based on the actual edges in the mesh.
  *
  */
-typedef struct Cloth
-{
+typedef struct Cloth {
 	struct ClothVertex	*verts;			/* The vertices that represent this cloth. */
 	struct	LinkNode	*springs;		/* The springs connecting the mesh. */
 	unsigned int		numverts;		/* The number of verts == m * n. */
@@ -91,8 +90,7 @@
 /**
  * The definition of a cloth vertex.
  */
-typedef struct ClothVertex
-{
+typedef struct ClothVertex {
 	int	flags;		/* General flags per vertex.		*/
 	float	v[3];		/* The velocity of the point.		*/
 	float	xconst[3];	/* constrained position			*/
@@ -117,8 +115,7 @@
 /**
  * The definition of a spring.
  */
-typedef struct ClothSpring
-{
+typedef struct ClothSpring {
 	int	ij;		/* Pij from the paper, one end of the spring.	*/
 	int	kl;		/* Pkl from the paper, one end of the spring.	*/
 	float	restlen;	/* The original length of the spring.	*/
@@ -149,8 +146,7 @@
 
 /* SIMULATION FLAGS: goal flags,.. */
 /* These are the bits used in SimSettings.flags. */
-typedef enum
-{
+typedef enum {
 	CLOTH_SIMSETTINGS_FLAG_COLLOBJ = ( 1 << 2 ),// object is only collision object, no cloth simulation is done
 	CLOTH_SIMSETTINGS_FLAG_GOAL = ( 1 << 3 ), 	// we have goals enabled
 	CLOTH_SIMSETTINGS_FLAG_TEARING = ( 1 << 4 ),// true if tearing is enabled
@@ -160,15 +156,13 @@
 } CLOTH_SIMSETTINGS_FLAGS;
 
 /* COLLISION FLAGS */
-typedef enum
-{
+typedef enum {
 	CLOTH_COLLSETTINGS_FLAG_ENABLED = ( 1 << 1 ), /* enables cloth - object collisions */
 	CLOTH_COLLSETTINGS_FLAG_SELF = ( 1 << 2 ), /* enables selfcollisions */
 } CLOTH_COLLISIONSETTINGS_FLAGS;
 
 /* Spring types as defined in the paper.*/
-typedef enum
-{
+typedef enum {
 	CLOTH_SPRING_TYPE_STRUCTURAL  = (1 << 1),
 	CLOTH_SPRING_TYPE_SHEAR       = (1 << 2),
 	CLOTH_SPRING_TYPE_BENDING     = (1 << 3),
@@ -176,8 +170,7 @@
 } CLOTH_SPRING_TYPES;
 
 /* SPRING FLAGS */
-typedef enum
-{
+typedef enum {
 	CLOTH_SPRING_FLAG_DEACTIVATE = ( 1 << 1 ),
 	CLOTH_SPRING_FLAG_NEEDED = ( 1 << 2 ), // springs has values to be applied
 } CLOTH_SPRINGS_FLAGS;
@@ -230,16 +223,14 @@
 
 /* This enum provides the IDs for our solvers. */
 // only one available in the moment
-typedef enum
-{
+typedef enum {
 	CM_IMPLICIT = 0,
 } CM_SOLVER_ID;
 
 
 /* This structure defines how to call the solver.
  */
-typedef struct
-{
+typedef struct {
 	const char		*name;
 	CM_SOLVER_ID	id;
 	int	( *init ) (struct Object *ob, struct ClothModifierData *clmd );

Modified: trunk/blender/source/blender/blenkernel/BKE_collision.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_collision.h	2012-06-06 22:37:28 UTC (rev 47545)
+++ trunk/blender/source/blender/blenkernel/BKE_collision.h	2012-06-06 22:38:39 UTC (rev 47546)
@@ -59,8 +59,7 @@
 ////////////////////////////////////////
 
 /* COLLISION FLAGS */
-typedef enum
-{
+typedef enum {
 	COLLISION_IN_FUTURE =       (1 << 1),
 #ifdef WITH_ELTOPO
 	COLLISION_USE_COLLFACE =    (1 << 2),

Modified: trunk/blender/source/blender/blenkernel/BKE_node.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_node.h	2012-06-06 22:37:28 UTC (rev 47545)
+++ trunk/blender/source/blender/blenkernel/BKE_node.h	2012-06-06 22:38:39 UTC (rev 47546)
@@ -266,8 +266,7 @@
 
 typedef void (*bNodeTreeCallback)(void *calldata, struct ID *owner_id, struct bNodeTree *ntree);
 typedef void (*bNodeClassCallback)(void *calldata, int nclass, const char *name);
-typedef struct bNodeTreeType
-{
+typedef struct bNodeTreeType {
 	int type;						/* type identifier */
 	char idname[64];				/* id name for RNA identification */
 	

Modified: trunk/blender/source/blender/blenkernel/BKE_sketch.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_sketch.h	2012-06-06 22:37:28 UTC (rev 47545)
+++ trunk/blender/source/blender/blenkernel/BKE_sketch.h	2012-06-06 22:38:39 UTC (rev 47546)
@@ -26,14 +26,12 @@
  *  \ingroup bke
  */
 
-typedef enum SK_PType
-{
+typedef enum SK_PType {
 	PT_CONTINUOUS,
 	PT_EXACT,
 } SK_PType;
 
-typedef enum SK_PMode
-{
+typedef enum SK_PMode {
 	PT_SNAP,
 	PT_PROJECT,
 } SK_PMode;

Modified: trunk/blender/source/blender/blenkernel/intern/implicit.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/implicit.c	2012-06-06 22:37:28 UTC (rev 47545)
+++ trunk/blender/source/blender/blenkernel/intern/implicit.c	2012-06-06 22:38:39 UTC (rev 47546)
@@ -695,8 +695,7 @@
 ///////////////////////////////////////////////////////////////////
 // simulator start
 ///////////////////////////////////////////////////////////////////
-typedef struct Implicit_Data 
-{
+typedef struct Implicit_Data  {
 	lfVector *X, *V, *Xnew, *Vnew, *olddV, *F, *B, *dV, *z;
 	fmatrix3x3 *A, *dFdV, *dFdX, *S, *P, *Pinv, *bigI, *M; 
 } Implicit_Data;

Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c	2012-06-06 22:37:28 UTC (rev 47545)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c	2012-06-06 22:38:39 UTC (rev 47546)
@@ -2363,13 +2363,12 @@
 }
 
 #define SPH_NEIGHBORS 512
-typedef struct SPHNeighbor
-{
+typedef struct SPHNeighbor {
 	ParticleSystem *psys;
 	int index;
 } SPHNeighbor;
-typedef struct SPHRangeData
-{
+
+typedef struct SPHRangeData {
 	SPHNeighbor neighbors[SPH_NEIGHBORS];
 	int tot_neighbors;
 
@@ -2641,8 +2640,7 @@
 /************************************************/
 /*			Basic physics						*/
 /************************************************/
-typedef struct EfData
-{
+typedef struct EfData {
 	ParticleTexture ptex;
 	ParticleSimulationData *sim;
 	ParticleData *pa;

Modified: trunk/blender/source/blender/blenkernel/intern/seqcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/seqcache.c	2012-06-06 22:37:28 UTC (rev 47545)
+++ trunk/blender/source/blender/blenkernel/intern/seqcache.c	2012-06-06 22:38:39 UTC (rev 47546)
@@ -38,8 +38,7 @@
 
 #include "IMB_moviecache.h"
 
-typedef struct seqCacheKey 
-{
+typedef struct seqCacheKey {
 	struct Sequence * seq;
 	SeqRenderData context;
 	float cfra;


@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list