[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51463] trunk/blender: style cleanup
Campbell Barton
ideasman42 at gmail.com
Sat Oct 20 20:46:58 CEST 2012
Revision: 51463
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51463
Author: campbellbarton
Date: 2012-10-20 18:46:57 +0000 (Sat, 20 Oct 2012)
Log Message:
-----------
style cleanup
Modified Paths:
--------------
trunk/blender/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
trunk/blender/intern/smoke/intern/spectrum.cpp
trunk/blender/intern/smoke/intern/spectrum.h
trunk/blender/release/windows/contrib/vfapi/vfapi-plugin.c
trunk/blender/source/blender/blenkernel/intern/particle_system.c
trunk/blender/source/blender/blenkernel/intern/pointcache.c
trunk/blender/source/blender/blenkernel/intern/seqeffects.c
trunk/blender/source/blender/blenlib/BLI_scanfill.h
trunk/blender/source/blender/blenlib/intern/freetypefont.c
trunk/blender/source/blender/blenloader/intern/readfile.c
trunk/blender/source/blender/blenloader/intern/versioning_legacy.c
trunk/blender/source/blender/blenloader/intern/writefile.c
trunk/blender/source/blender/bmesh/intern/bmesh_decimate.c
trunk/blender/source/blender/collada/AnimationImporter.h
trunk/blender/source/blender/collada/DocumentExporter.h
trunk/blender/source/blender/quicktime/apple/qtkit_export.m
trunk/blender/source/blender/quicktime/apple/qtkit_import.m
trunk/blender/source/blender/render/extern/include/RE_pipeline.h
trunk/blender/source/blender/render/intern/source/convertblender.c
trunk/blender/source/blender/render/intern/source/imagetexture.c
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderCanvas.cpp
trunk/blender/source/gameengine/BlenderRoutines/KX_BlenderRenderTools.cpp
trunk/blender/source/gameengine/Ketsji/KX_NavMeshObject.cpp
trunk/blender/source/gameengine/Physics/Bullet/CcdPhysicsEnvironment.cpp
Modified: trunk/blender/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp
===================================================================
--- trunk/blender/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp 2012-10-20 18:12:22 UTC (rev 51462)
+++ trunk/blender/extern/recastnavigation/Recast/Source/RecastMeshDetail.cpp 2012-10-20 18:46:57 UTC (rev 51463)
@@ -1015,7 +1015,7 @@
maxhh = rcMax(maxhh, ymax-ymin);
}
- hp.data = (unsigned short*)rcAlloc(sizeof(unsigned short)*maxhw*maxhh, RC_ALLOC_TEMP);
+ hp.data = (unsigned short *)rcAlloc(sizeof(unsigned short)*maxhw*maxhh, RC_ALLOC_TEMP);
if (!hp.data)
{
ctx->log(RC_LOG_ERROR, "rcBuildPolyMeshDetail: Out of memory 'hp.data' (%d).", maxhw*maxhh);
Modified: trunk/blender/intern/smoke/intern/spectrum.cpp
===================================================================
--- trunk/blender/intern/smoke/intern/spectrum.cpp 2012-10-20 18:12:22 UTC (rev 51462)
+++ trunk/blender/intern/smoke/intern/spectrum.cpp 2012-10-20 18:46:57 UTC (rev 51463)
@@ -385,7 +385,7 @@
*z = s;
}
-void spectrum(double t1, double t2, int N, unsigned char* d)
+void spectrum(double t1, double t2, int N, unsigned char *d)
{
int i,j,dj;
double X,Y,Z,R,G,B,L,M,S, Lw, Mw, Sw;
Modified: trunk/blender/intern/smoke/intern/spectrum.h
===================================================================
--- trunk/blender/intern/smoke/intern/spectrum.h 2012-10-20 18:12:22 UTC (rev 51462)
+++ trunk/blender/intern/smoke/intern/spectrum.h 2012-10-20 18:46:57 UTC (rev 51463)
@@ -1,6 +1,6 @@
#ifndef __SPECTRUM_H
#define __SPECTRUM_H
-void spectrum(double t1, double t2, int n, unsigned char* d);
+void spectrum(double t1, double t2, int n, unsigned char *d);
#endif
Modified: trunk/blender/release/windows/contrib/vfapi/vfapi-plugin.c
===================================================================
--- trunk/blender/release/windows/contrib/vfapi/vfapi-plugin.c 2012-10-20 18:12:22 UTC (rev 51462)
+++ trunk/blender/release/windows/contrib/vfapi/vfapi-plugin.c 2012-10-20 18:46:57 UTC (rev 51463)
@@ -382,7 +382,7 @@
my_gets(s_in, buf, 256); /* 255 */
- framebuf = (unsigned char*) v->lpData;
+ framebuf = (unsigned char *) v->lpData;
for (y = 0; y < height; y++) {
unsigned char *p = framebuf + v->lPitch * y;
Modified: trunk/blender/source/blender/blenkernel/intern/particle_system.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/particle_system.c 2012-10-20 18:12:22 UTC (rev 51462)
+++ trunk/blender/source/blender/blenkernel/intern/particle_system.c 2012-10-20 18:46:57 UTC (rev 51463)
@@ -973,8 +973,8 @@
static int *COMPARE_ORIG_INDEX = NULL;
static int distribute_compare_orig_index(const void *p1, const void *p2)
{
- int index1 = COMPARE_ORIG_INDEX[*(const int*)p1];
- int index2 = COMPARE_ORIG_INDEX[*(const int*)p2];
+ int index1 = COMPARE_ORIG_INDEX[*(const int *)p1];
+ int index2 = COMPARE_ORIG_INDEX[*(const int *)p2];
if (index1 < index2)
return -1;
Modified: trunk/blender/source/blender/blenkernel/intern/pointcache.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/pointcache.c 2012-10-20 18:12:22 UTC (rev 51462)
+++ trunk/blender/source/blender/blenkernel/intern/pointcache.c 2012-10-20 18:46:57 UTC (rev 51463)
@@ -705,25 +705,25 @@
smoke_export(sds->fluid, &dt, &dx, &dens, &react, &flame, &fuel, &heat, &heatold, &vx, &vy, &vz, &r, &g, &b, &obstacles);
ptcache_file_compressed_read(pf, (unsigned char *)sds->shadow, out_len);
- ptcache_file_compressed_read(pf, (unsigned char*)dens, out_len);
+ ptcache_file_compressed_read(pf, (unsigned char *)dens, out_len);
if (cache_fields & SM_ACTIVE_HEAT) {
- ptcache_file_compressed_read(pf, (unsigned char*)heat, out_len);
- ptcache_file_compressed_read(pf, (unsigned char*)heatold, out_len);
+ ptcache_file_compressed_read(pf, (unsigned char *)heat, out_len);
+ ptcache_file_compressed_read(pf, (unsigned char *)heatold, out_len);
}
if (cache_fields & SM_ACTIVE_FIRE) {
- ptcache_file_compressed_read(pf, (unsigned char*)flame, out_len);
- ptcache_file_compressed_read(pf, (unsigned char*)fuel, out_len);
- ptcache_file_compressed_read(pf, (unsigned char*)react, out_len);
+ ptcache_file_compressed_read(pf, (unsigned char *)flame, out_len);
+ ptcache_file_compressed_read(pf, (unsigned char *)fuel, out_len);
+ ptcache_file_compressed_read(pf, (unsigned char *)react, out_len);
}
if (cache_fields & SM_ACTIVE_COLORS) {
- ptcache_file_compressed_read(pf, (unsigned char*)r, out_len);
- ptcache_file_compressed_read(pf, (unsigned char*)g, out_len);
- ptcache_file_compressed_read(pf, (unsigned char*)b, out_len);
+ ptcache_file_compressed_read(pf, (unsigned char *)r, out_len);
+ ptcache_file_compressed_read(pf, (unsigned char *)g, out_len);
+ ptcache_file_compressed_read(pf, (unsigned char *)b, out_len);
}
- ptcache_file_compressed_read(pf, (unsigned char*)vx, out_len);
- ptcache_file_compressed_read(pf, (unsigned char*)vy, out_len);
- ptcache_file_compressed_read(pf, (unsigned char*)vz, out_len);
- ptcache_file_compressed_read(pf, (unsigned char*)obstacles, (unsigned int)res);
+ ptcache_file_compressed_read(pf, (unsigned char *)vx, out_len);
+ ptcache_file_compressed_read(pf, (unsigned char *)vy, out_len);
+ ptcache_file_compressed_read(pf, (unsigned char *)vz, out_len);
+ ptcache_file_compressed_read(pf, (unsigned char *)obstacles, (unsigned int)res);
ptcache_file_read(pf, &dt, 1, sizeof(float));
ptcache_file_read(pf, &dx, 1, sizeof(float));
ptcache_file_read(pf, &sds->p0, 3, sizeof(float));
@@ -751,20 +751,20 @@
smoke_turbulence_export(sds->wt, &dens, &react, &flame, &fuel, &r, &g, &b, &tcu, &tcv, &tcw);
- ptcache_file_compressed_read(pf, (unsigned char*)dens, out_len_big);
+ ptcache_file_compressed_read(pf, (unsigned char *)dens, out_len_big);
if (cache_fields & SM_ACTIVE_FIRE) {
- ptcache_file_compressed_read(pf, (unsigned char*)flame, out_len_big);
- ptcache_file_compressed_read(pf, (unsigned char*)fuel, out_len_big);
+ ptcache_file_compressed_read(pf, (unsigned char *)flame, out_len_big);
+ ptcache_file_compressed_read(pf, (unsigned char *)fuel, out_len_big);
}
if (cache_fields & SM_ACTIVE_COLORS) {
- ptcache_file_compressed_read(pf, (unsigned char*)r, out_len_big);
- ptcache_file_compressed_read(pf, (unsigned char*)g, out_len_big);
- ptcache_file_compressed_read(pf, (unsigned char*)b, out_len_big);
+ ptcache_file_compressed_read(pf, (unsigned char *)r, out_len_big);
+ ptcache_file_compressed_read(pf, (unsigned char *)g, out_len_big);
+ ptcache_file_compressed_read(pf, (unsigned char *)b, out_len_big);
}
- ptcache_file_compressed_read(pf, (unsigned char*)tcu, out_len);
- ptcache_file_compressed_read(pf, (unsigned char*)tcv, out_len);
- ptcache_file_compressed_read(pf, (unsigned char*)tcw, out_len);
+ ptcache_file_compressed_read(pf, (unsigned char *)tcu, out_len);
+ ptcache_file_compressed_read(pf, (unsigned char *)tcv, out_len);
+ ptcache_file_compressed_read(pf, (unsigned char *)tcw, out_len);
}
return 1;
@@ -859,7 +859,7 @@
return 0;
}
- ptcache_file_compressed_read(pf, (unsigned char*)surface->data->type_data, data_len*surface->data->total_points);
+ ptcache_file_compressed_read(pf, (unsigned char *)surface->data->type_data, data_len*surface->data->total_points);
}
return 1;
@@ -1699,7 +1699,7 @@
for (i=0; i<BPHYS_TOT_DATA; i++) {
unsigned int out_len = pm->totpoint*ptcache_data_size[i];
if (pf->data_types & (1<<i))
- ptcache_file_compressed_read(pf, (unsigned char*)(pm->data[i]), out_len);
+ ptcache_file_compressed_read(pf, (unsigned char *)(pm->data[i]), out_len);
}
}
else {
@@ -1730,7 +1730,7 @@
extra->data = MEM_callocN(extra->totdata * ptcache_extra_datasize[extra->type], "Pointcache extradata->data");
if (pf->flag & PTCACHE_TYPEFLAG_COMPRESS)
- ptcache_file_compressed_read(pf, (unsigned char*)(extra->data), extra->totdata*ptcache_extra_datasize[extra->type]);
+ ptcache_file_compressed_read(pf, (unsigned char *)(extra->data), extra->totdata*ptcache_extra_datasize[extra->type]);
else
ptcache_file_read(pf, extra->data, extra->totdata, ptcache_extra_datasize[extra->type]);
@@ -1787,7 +1787,7 @@
if (pm->data[i]) {
unsigned int in_len = pm->totpoint*ptcache_data_size[i];
unsigned char *out = (unsigned char *)MEM_callocN(LZO_OUT_LEN(in_len)*4, "pointcache_lzo_buffer");
- ptcache_file_compressed_write(pf, (unsigned char*)(pm->data[i]), in_len, out, pid->cache->compression);
+ ptcache_file_compressed_write(pf, (unsigned char *)(pm->data[i]), in_len, out, pid->cache->compression);
MEM_freeN(out);
}
}
@@ -1820,7 +1820,7 @@
if (pid->cache->compression) {
unsigned int in_len = extra->totdata * ptcache_extra_datasize[extra->type];
unsigned char *out = (unsigned char *)MEM_callocN(LZO_OUT_LEN(in_len)*4, "pointcache_lzo_buffer");
- ptcache_file_compressed_write(pf, (unsigned char*)(extra->data), in_len, out, pid->cache->compression);
+ ptcache_file_compressed_write(pf, (unsigned char *)(extra->data), in_len, out, pid->cache->compression);
MEM_freeN(out);
}
else {
Modified: trunk/blender/source/blender/blenkernel/intern/seqeffects.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2012-10-20 18:12:22 UTC (rev 51462)
+++ trunk/blender/source/blender/blenkernel/intern/seqeffects.c 2012-10-20 18:46:57 UTC (rev 51463)
@@ -62,14 +62,14 @@
{
int offset = 4 * start_line * context->rectx;
- *rect1 = (unsigned char*) ibuf1->rect + offset;
- *rect_out = (unsigned char*) out->rect + offset;
+ *rect1 = (unsigned char *)ibuf1->rect + offset;
+ *rect_out = (unsigned char *)out->rect + offset;
if (ibuf2)
- *rect2 = (unsigned char*) ibuf2->rect + offset;
+ *rect2 = (unsigned char *)ibuf2->rect + offset;
if (ibuf3)
- *rect3 = (unsigned char*) ibuf3->rect + offset;
+ *rect3 = (unsigned char *)ibuf3->rect + offset;
}
static void slice_get_float_buffers(const SeqRenderData *context, const ImBuf *ibuf1, const ImBuf *ibuf2,
Modified: trunk/blender/source/blender/blenlib/BLI_scanfill.h
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list