diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-12-28 18:19:05 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-28 18:19:05 +0400 |
commit | 857df8065face58eff5556953cdf2dd72e09f2b6 (patch) | |
tree | 51fdb13476e00b7ec1a7575d9c0293de2b17bd7d /source/blender/blenkernel/intern | |
parent | ddf39a87aa704240a0cb0cac584893ba34700e5d (diff) |
style cleanup
Diffstat (limited to 'source/blender/blenkernel/intern')
-rw-r--r-- | source/blender/blenkernel/intern/cloth.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/collision.c | 6 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/image.c | 2 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/node.c | 10 | ||||
-rw-r--r-- | source/blender/blenkernel/intern/pointcache.c | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/blenkernel/intern/cloth.c b/source/blender/blenkernel/intern/cloth.c index f1d73c7777a..fdd7dc94979 100644 --- a/source/blender/blenkernel/intern/cloth.c +++ b/source/blender/blenkernel/intern/cloth.c @@ -1153,7 +1153,7 @@ static int cloth_build_springs ( ClothModifierData *clmd, DerivedMesh *dm ) if ( !mface[i].v4 ) continue; - spring = ( ClothSpring *) MEM_callocN ( sizeof ( ClothSpring ), "cloth spring" ); + spring = (ClothSpring *)MEM_callocN(sizeof(ClothSpring), "cloth spring"); if (!spring) { cloth_free_errorsprings(cloth, edgehash, edgelist); diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index f0043d9fa77..60bf67e19e3 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -528,7 +528,7 @@ static void add_collision_object(Object ***objs, unsigned int *numobj, unsigned /* extend array */ if (*numobj >= *maxobj) { *maxobj *= 2; - *objs= MEM_reallocN(*objs, sizeof(Object*)*(*maxobj)); + *objs= MEM_reallocN(*objs, sizeof(Object *)*(*maxobj)); } (*objs)[*numobj] = ob; @@ -740,7 +740,7 @@ int cloth_bvh_objcollision(Object *ob, ClothModifierData * clmd, float step, flo /* move object to position (step) in time */ for (i = 0; i < numcollobj; i++) { Object *collob= collobjs[i]; - CollisionModifierData *collmd = (CollisionModifierData*)modifiers_findByType(collob, eModifierType_Collision); + CollisionModifierData *collmd = (CollisionModifierData *)modifiers_findByType(collob, eModifierType_Collision); if (!collmd->bvhtree) continue; @@ -760,7 +760,7 @@ int cloth_bvh_objcollision(Object *ob, ClothModifierData * clmd, float step, flo // check all collision objects for (i = 0; i < numcollobj; i++) { Object *collob= collobjs[i]; - CollisionModifierData *collmd = (CollisionModifierData*)modifiers_findByType(collob, eModifierType_Collision); + CollisionModifierData *collmd = (CollisionModifierData *)modifiers_findByType(collob, eModifierType_Collision); BVHTreeOverlap *overlap = NULL; unsigned int result = 0; diff --git a/source/blender/blenkernel/intern/image.c b/source/blender/blenkernel/intern/image.c index 7782afaca25..22995e5a7ee 100644 --- a/source/blender/blenkernel/intern/image.c +++ b/source/blender/blenkernel/intern/image.c @@ -1996,7 +1996,7 @@ int BKE_imbuf_write_stamp(Scene *scene, struct Object *camera, ImBuf *ibuf, cons static void do_makepicstring(char *string, const char *base, const char *relbase, int frame, const char imtype, - const ImageFormatData *im_format, const short use_ext, const short use_frames) + const ImageFormatData *im_format, const short use_ext, const short use_frames) { if (string == NULL) return; BLI_strncpy(string, base, FILE_MAX - 10); /* weak assumption */ diff --git a/source/blender/blenkernel/intern/node.c b/source/blender/blenkernel/intern/node.c index 8babdf2402f..a6ec1f33edc 100644 --- a/source/blender/blenkernel/intern/node.c +++ b/source/blender/blenkernel/intern/node.c @@ -1161,11 +1161,11 @@ void ntreeSetOutput(bNodeTree *ntree) bNodeTree *ntreeFromID(ID *id) { switch (GS(id->name)) { - case ID_MA: return ((Material*)id)->nodetree; - case ID_LA: return ((Lamp*)id)->nodetree; - case ID_WO: return ((World*)id)->nodetree; - case ID_TE: return ((Tex*)id)->nodetree; - case ID_SCE: return ((Scene*)id)->nodetree; + case ID_MA: return ((Material *)id)->nodetree; + case ID_LA: return ((Lamp *)id)->nodetree; + case ID_WO: return ((World *)id)->nodetree; + case ID_TE: return ((Tex *)id)->nodetree; + case ID_SCE: return ((Scene *)id)->nodetree; default: return NULL; } } diff --git a/source/blender/blenkernel/intern/pointcache.c b/source/blender/blenkernel/intern/pointcache.c index 2eadfe73858..9c3c1b0e508 100644 --- a/source/blender/blenkernel/intern/pointcache.c +++ b/source/blender/blenkernel/intern/pointcache.c @@ -1540,7 +1540,7 @@ void BKE_ptcache_mem_pointers_incr(PTCacheMem *pm) for (i=0; i<BPHYS_TOT_DATA; i++) { if (pm->cur[i]) - pm->cur[i] = (char*)pm->cur[i] + ptcache_data_size[i]; + pm->cur[i] = (char *)pm->cur[i] + ptcache_data_size[i]; } } int BKE_ptcache_mem_pointers_seek(int point_index, PTCacheMem *pm) @@ -1558,7 +1558,7 @@ int BKE_ptcache_mem_pointers_seek(int point_index, PTCacheMem *pm) } for (i=0; i<BPHYS_TOT_DATA; i++) - pm->cur[i] = data_types & (1<<i) ? (char*)pm->data[i] + index * ptcache_data_size[i] : NULL; + pm->cur[i] = data_types & (1<<i) ? (char *)pm->data[i] + index * ptcache_data_size[i] : NULL; return 1; } |