[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55108] trunk/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Fri Mar 8 05:00:06 CET 2013
Revision: 55108
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55108
Author: campbellbarton
Date: 2013-03-08 04:00:06 +0000 (Fri, 08 Mar 2013)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/intern/utfconv/utf_winfunc.c
trunk/blender/release/windows/contrib/vfapi/vfapi-plugin.c
trunk/blender/source/blender/blenkernel/BKE_paint.h
trunk/blender/source/blender/blenkernel/BKE_sequencer.h
trunk/blender/source/blender/blenkernel/intern/bmfont.c
trunk/blender/source/blender/blenkernel/intern/collision.c
trunk/blender/source/blender/blenkernel/intern/implicit.c
trunk/blender/source/blender/blenkernel/intern/nla.c
trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenkernel/intern/seqcache.c
trunk/blender/source/blender/blenkernel/intern/sequencer.c
trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
trunk/blender/source/blender/collada/AnimationExporter.cpp
trunk/blender/source/blender/collada/GeometryExporter.h
trunk/blender/source/blender/collada/MaterialExporter.h
trunk/blender/source/blender/editors/gpencil/gpencil_buttons.c
trunk/blender/source/blender/editors/include/ED_sequencer.h
trunk/blender/source/blender/editors/interface/interface.c
trunk/blender/source/blender/editors/io/io_collada.c
trunk/blender/source/blender/editors/object/object_edit.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image_2d.c
trunk/blender/source/blender/editors/sculpt_paint/paint_image_proj.c
trunk/blender/source/blender/editors/sculpt_paint/paint_stroke.c
trunk/blender/source/blender/editors/sculpt_paint/sculpt.c
trunk/blender/source/blender/editors/space_node/drawnode.c
trunk/blender/source/blender/editors/space_node/node_edit.c
trunk/blender/source/blender/editors/space_outliner/outliner_tools.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_edit.c
trunk/blender/source/blender/editors/space_sequencer/sequencer_select.c
trunk/blender/source/blender/editors/space_view3d/view3d_ruler.c
trunk/blender/source/blender/editors/transform/transform_snap.c
trunk/blender/source/blender/gpu/intern/gpu_draw.c
trunk/blender/source/blender/imbuf/intern/dds/BlockDXT.cpp
trunk/blender/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp
trunk/blender/source/blender/makesrna/intern/rna_mesh.c
trunk/blender/source/blender/modifiers/intern/MOD_laplaciansmooth.c
trunk/blender/source/blender/render/intern/source/imagetexture.c
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
trunk/blender/source/tests/bl_pyapi_mathutils.py
Modified: trunk/blender/intern/utfconv/utf_winfunc.c
===================================================================
--- trunk/blender/intern/utfconv/utf_winfunc.c 2013-03-08 03:42:16 UTC (rev 55107)
+++ trunk/blender/intern/utfconv/utf_winfunc.c 2013-03-08 04:00:06 UTC (rev 55108)
@@ -123,7 +123,7 @@
free(val);
}
-int uput_getenv(const char *varname, char * value, size_t buffsize)
+int uput_getenv(const char *varname, char *value, size_t buffsize)
{
int r = 0;
wchar_t * str;
Modified: trunk/blender/release/windows/contrib/vfapi/vfapi-plugin.c
===================================================================
--- trunk/blender/release/windows/contrib/vfapi/vfapi-plugin.c 2013-03-08 03:42:16 UTC (rev 55107)
+++ trunk/blender/release/windows/contrib/vfapi/vfapi-plugin.c 2013-03-08 04:00:06 UTC (rev 55108)
@@ -127,12 +127,12 @@
return (ip);
}
-static void my_send(SOCKET sock, char * str)
+static void my_send(SOCKET sock, char *str)
{
send(sock, str, strlen(str), 0);
}
-static int my_recv(SOCKET sock, char * line, int maxlen)
+static int my_recv(SOCKET sock, char *line, int maxlen)
{
int got = 0;
int toget = maxlen;
@@ -148,7 +148,7 @@
return maxlen;
}
-static int my_gets(SOCKET sock, char * line, int maxlen)
+static int my_gets(SOCKET sock, char *line, int maxlen)
{
int last_rval = 0;
Modified: trunk/blender/source/blender/blenkernel/BKE_paint.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_paint.h 2013-03-08 03:42:16 UTC (rev 55107)
+++ trunk/blender/source/blender/blenkernel/BKE_paint.h 2013-03-08 04:00:06 UTC (rev 55108)
@@ -54,7 +54,7 @@
extern const char PAINT_CURSOR_WEIGHT_PAINT[3];
extern const char PAINT_CURSOR_TEXTURE_PAINT[3];
-typedef enum PaintMode{
+typedef enum PaintMode {
PAINT_SCULPT,
PAINT_VERTEX,
PAINT_WEIGHT,
Modified: trunk/blender/source/blender/blenkernel/BKE_sequencer.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_sequencer.h 2013-03-08 03:42:16 UTC (rev 55107)
+++ trunk/blender/source/blender/blenkernel/BKE_sequencer.h 2013-03-08 04:00:06 UTC (rev 55108)
@@ -192,7 +192,7 @@
/* **********************************************************************
* sequencer scene functions
* ********************************************************************** */
-struct Editing *BKE_sequencer_editing_get(struct Scene *scene, int alloc);
+struct Editing *BKE_sequencer_editing_get(struct Scene *scene, bool alloc);
struct Editing *BKE_sequencer_editing_ensure(struct Scene *scene);
void BKE_sequencer_editing_free(struct Scene *scene);
Modified: trunk/blender/source/blender/blenkernel/intern/bmfont.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/bmfont.c 2013-03-08 03:42:16 UTC (rev 55107)
+++ trunk/blender/source/blender/blenkernel/intern/bmfont.c 2013-03-08 04:00:06 UTC (rev 55108)
@@ -56,7 +56,7 @@
#include "BKE_bmfont.h"
#include "BKE_bmfont_types.h"
-void printfGlyph(bmGlyph * glyph)
+void printfGlyph(bmGlyph *glyph)
{
printf("unicode: %d '%c'\n", glyph->unicode, glyph->unicode);
printf(" locx: %4d locy: %4d\n", glyph->locx, glyph->locy);
@@ -68,7 +68,7 @@
#define MAX2(x, y) ((x) > (y) ? (x) : (y))
#define MAX3(x, y, z) (MAX2(MAX2((x), (y)), (z)))
-void calcAlpha(ImBuf * ibuf)
+void calcAlpha(ImBuf *ibuf)
{
int i;
char * rect;
@@ -82,7 +82,7 @@
}
}
-void readBitmapFontVersion0(ImBuf * ibuf, unsigned char * rect, int step)
+void readBitmapFontVersion0(ImBuf *ibuf, unsigned char *rect, int step)
{
int glyphcount, bytes, i, index, linelength, ysize;
unsigned char * buffer;
Modified: trunk/blender/source/blender/blenkernel/intern/collision.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/collision.c 2013-03-08 03:42:16 UTC (rev 55107)
+++ trunk/blender/source/blender/blenkernel/intern/collision.c 2013-03-08 04:00:06 UTC (rev 55108)
@@ -116,7 +116,7 @@
return tree;
}
-void bvhtree_update_from_mvert(BVHTree * bvhtree, MFace *faces, int numfaces, MVert *x, MVert *xnew, int UNUSED(numverts), int moving )
+void bvhtree_update_from_mvert(BVHTree *bvhtree, MFace *faces, int numfaces, MVert *x, MVert *xnew, int UNUSED(numverts), int moving )
{
int i;
MFace *mfaces = faces;
@@ -706,7 +706,7 @@
}
// cloth - object collisions
-int cloth_bvh_objcollision(Object *ob, ClothModifierData * clmd, float step, float dt )
+int cloth_bvh_objcollision(Object *ob, ClothModifierData *clmd, float step, float dt )
{
Cloth *cloth= clmd->clothObject;
BVHTree *cloth_bvh= cloth->bvhtree;
Modified: trunk/blender/source/blender/blenkernel/intern/implicit.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/implicit.c 2013-03-08 03:42:16 UTC (rev 55107)
+++ trunk/blender/source/blender/blenkernel/intern/implicit.c 2013-03-08 04:00:06 UTC (rev 55108)
@@ -1716,7 +1716,7 @@
* (edge distance constraints) in a lagrangian solver. then add forces to help
* guide the implicit solver to that state. this function is called after
* collisions*/
-static int UNUSED_FUNCTION(cloth_calc_helper_forces)(Object *UNUSED(ob), ClothModifierData * clmd, float (*initial_cos)[3], float UNUSED(step), float dt)
+static int UNUSED_FUNCTION(cloth_calc_helper_forces)(Object *UNUSED(ob), ClothModifierData *clmd, float (*initial_cos)[3], float UNUSED(step), float dt)
{
Cloth *cloth= clmd->clothObject;
float (*cos)[3] = MEM_callocN(sizeof(float)*3*cloth->numverts, "cos cloth_calc_helper_forces");
Modified: trunk/blender/source/blender/blenkernel/intern/nla.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/nla.c 2013-03-08 03:42:16 UTC (rev 55107)
+++ trunk/blender/source/blender/blenkernel/intern/nla.c 2013-03-08 04:00:06 UTC (rev 55108)
@@ -1660,7 +1660,7 @@
/* Baking Tools ------------------------------------------- */
-static void UNUSED_FUNCTION(BKE_nla_bake) (Scene * scene, ID *UNUSED(id), AnimData * adt, int UNUSED(flag))
+static void UNUSED_FUNCTION(BKE_nla_bake) (Scene *scene, ID *UNUSED(id), AnimData *adt, int UNUSED(flag))
{
/* verify that data is valid
Modified: trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c 2013-03-08 03:42:16 UTC (rev 55107)
+++ trunk/blender/source/blender/blenkernel/intern/pbvh_bmesh.c 2013-03-08 04:00:06 UTC (rev 55108)
@@ -1342,7 +1342,7 @@
/* Check that the vertex is in the node */
BLI_assert(BLI_ghash_haskey(n->bm_unique_verts, v) ^
- BLI_ghash_haskey(n->bm_other_verts, v));
+ BLI_ghash_haskey(n->bm_other_verts, v));
/* Check that the vertex has a node owner */
nv = pbvh_bmesh_node_lookup(bvh, bvh->bm_vert_to_node, v);
Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c 2013-03-08 03:42:16 UTC (rev 55107)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c 2013-03-08 04:00:06 UTC (rev 55108)
@@ -3039,7 +3039,7 @@
}
/* if bake is not given run simulations to current frame */
-void BKE_ptcache_bake(PTCacheBaker* baker)
+void BKE_ptcache_bake(PTCacheBaker *baker)
{
Main *bmain = baker->main;
Scene *scene = baker->scene;
Modified: trunk/blender/source/blender/blenkernel/intern/seqcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/seqcache.c 2013-03-08 03:42:16 UTC (rev 55107)
+++ trunk/blender/source/blender/blenkernel/intern/seqcache.c 2013-03-08 04:00:06 UTC (rev 55108)
@@ -26,7 +26,6 @@
* \ingroup bke
*/
-
#include <stddef.h>
#include "BLO_sys_types.h" /* for intptr_t */
@@ -34,7 +33,6 @@
#include "MEM_guardedalloc.h"
#include "DNA_sequence_types.h"
-#include "BKE_sequencer.h"
#include "IMB_moviecache.h"
#include "IMB_imbuf.h"
@@ -42,6 +40,8 @@
#include "BLI_listbase.h"
+#include "BKE_sequencer.h"
+
typedef struct SeqCacheKey {
struct Sequence *seq;
SeqRenderData context;
Modified: trunk/blender/source/blender/blenkernel/intern/sequencer.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/sequencer.c 2013-03-08 03:42:16 UTC (rev 55107)
+++ trunk/blender/source/blender/blenkernel/intern/sequencer.c 2013-03-08 04:00:06 UTC (rev 55108)
@@ -245,7 +245,7 @@
}
-Editing *BKE_sequencer_editing_get(Scene *scene, int alloc)
+Editing *BKE_sequencer_editing_get(Scene *scene, bool alloc)
{
if (alloc) {
BKE_sequencer_editing_ensure(scene);
Modified: trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c
===================================================================
--- trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c 2013-03-08 03:42:16 UTC (rev 55107)
+++ trunk/blender/source/blender/bmesh/operators/bmo_dissolve.c 2013-03-08 04:00:06 UTC (rev 55108)
@@ -41,7 +41,7 @@
#define VERT_MARK 1
-static bool UNUSED_FUNCTION(check_hole_in_region) (BMesh * bm, BMFace * f)
+static bool UNUSED_FUNCTION(check_hole_in_region) (BMesh *bm, BMFace *f)
{
BMWalker regwalker;
BMIter liter2;
Modified: trunk/blender/source/blender/collada/AnimationExporter.cpp
===================================================================
--- trunk/blender/source/blender/collada/AnimationExporter.cpp 2013-03-08 03:42:16 UTC (rev 55107)
+++ trunk/blender/source/blender/collada/AnimationExporter.cpp 2013-03-08 04:00:06 UTC (rev 55108)
@@ -901,7 +901,7 @@
}
-std::string AnimationExporter::create_4x4_source(std::vector<float> &frames, Object * ob, Bone *bone, const std::string& anim_id)
+std::string AnimationExporter::create_4x4_source(std::vector<float> &frames, Object *ob, Bone *bone, const std::string &anim_id)
{
COLLADASW::InputSemantic::Semantics semantic = COLLADASW::InputSemantic::OUTPUT;
std::string source_id = anim_id + get_semantic_suffix(semantic);
Modified: trunk/blender/source/blender/collada/GeometryExporter.h
===================================================================
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list