From e72239c6a45173c0d23868c8e66b0926dcf2fd9c Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Tue, 18 Dec 2012 01:52:18 +0000 Subject: style cleanup --- source/blender/blenkernel/intern/particle_system.c | 26 ++++++++++++++-------- source/blender/blenkernel/intern/smoke.c | 9 +++++--- source/blender/bmesh/CMakeLists.txt | 2 -- source/blender/editors/physics/physics_fluid.c | 2 +- .../editors/space_sequencer/space_sequencer.c | 3 ++- source/blender/imbuf/intern/cineon/cineonlib.c | 3 ++- source/blender/imbuf/intern/cineon/dpxlib.c | 3 ++- 7 files changed, 30 insertions(+), 18 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 26bdc751582..090082b333d 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -2400,7 +2400,8 @@ typedef struct SPHRangeData { int use_size; } SPHRangeData; -static void sph_evaluate_func(BVHTree *tree, ParticleSystem **psys, float co[3], SPHRangeData *pfr, float interaction_radius, BVHTree_RangeQuery callback) { +static void sph_evaluate_func(BVHTree *tree, ParticleSystem **psys, float co[3], SPHRangeData *pfr, float interaction_radius, BVHTree_RangeQuery callback) +{ int i; pfr->tot_neighbors = 0; @@ -2604,16 +2605,20 @@ static void sph_force_cb(void *sphdata_v, ParticleKey *state, float *force, floa } /* powf is really slow for raising to integer powers. */ -MINLINE float pow2(float x) { +MINLINE float pow2(float x) +{ return x * x; } -MINLINE float pow3(float x) { +MINLINE float pow3(float x) +{ return pow2(x) * x; } -MINLINE float pow4(float x) { +MINLINE float pow4(float x) +{ return pow2(pow2(x)); } -MINLINE float pow7(float x) { +MINLINE float pow7(float x) +{ return pow2(pow3(x)) * x; } @@ -2773,7 +2778,8 @@ static void sphclassical_force_cb(void *sphdata_v, ParticleKey *state, float *fo sphdata->pass++; } -static void sphclassical_calc_dens(ParticleData *pa, float UNUSED(dfra), SPHData *sphdata){ +static void sphclassical_calc_dens(ParticleData *pa, float UNUSED(dfra), SPHData *sphdata) +{ ParticleSystem **psys = sphdata->psys; SPHFluidSettings *fluid = psys[0]->part->fluid; /* 4.0 seems to be a pretty good value */ @@ -2834,7 +2840,8 @@ void psys_sph_finalise(SPHData *sphdata) } } /* Sample the density field at a point in space. */ -void psys_sph_density(BVHTree *tree, SPHData *sphdata, float co[3], float vars[2]) { +void psys_sph_density(BVHTree *tree, SPHData *sphdata, float co[3], float vars[2]) +{ ParticleSystem **psys = sphdata->psys; SPHFluidSettings *fluid = psys[0]->part->fluid; /* 4.0 seems to be a pretty good value */ @@ -4012,7 +4019,7 @@ static const float TIMESTEP_EXPANSION_TOLERANCE = 1.5f; * step, after the velocity has been updated. element_size defines the scale of * the simulation, and is typically the distance to neighboring particles. */ static void update_courant_num(ParticleSimulationData *sim, ParticleData *pa, - float dtime, SPHData *sphdata) + float dtime, SPHData *sphdata) { float relative_vel[3]; float speed; @@ -4022,7 +4029,8 @@ static void update_courant_num(ParticleSimulationData *sim, ParticleData *pa, if (sim->courant_num < speed * dtime / sphdata->element_size) sim->courant_num = speed * dtime / sphdata->element_size; } -static float get_base_time_step(ParticleSettings *part) { +static float get_base_time_step(ParticleSettings *part) +{ return 1.0f / (float) (part->subframes + 1); } /* Update time step size to suit current conditions. */ diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c index 53dfbdcfb85..c9cf5d561e5 100644 --- a/source/blender/blenkernel/intern/smoke.c +++ b/source/blender/blenkernel/intern/smoke.c @@ -924,7 +924,8 @@ static void clampBoundsInDomain(SmokeDomainSettings *sds, int min[3], int max[3] } } -static void em_allocateData(EmissionMap *em, int use_velocity) { +static void em_allocateData(EmissionMap *em, int use_velocity) +{ int i, res[3]; for (i = 0; i < 3; i++) { @@ -941,7 +942,8 @@ static void em_allocateData(EmissionMap *em, int use_velocity) { em->velocity = MEM_callocN(sizeof(float) * em->total_cells * 3, "smoke_flow_velocity"); } -static void em_freeData(EmissionMap *em) { +static void em_freeData(EmissionMap *em) +{ if (em->influence) MEM_freeN(em->influence); if (em->velocity) @@ -2509,7 +2511,8 @@ float smoke_get_velocity_at(struct Object *ob, float position[3], float velocity return -1.0f; } -int smoke_get_data_flags(SmokeDomainSettings *sds) { +int smoke_get_data_flags(SmokeDomainSettings *sds) +{ int flags = 0; if (smoke_has_heat(sds->fluid)) flags |= SM_ACTIVE_HEAT; if (smoke_has_fuel(sds->fluid)) flags |= SM_ACTIVE_FIRE; diff --git a/source/blender/bmesh/CMakeLists.txt b/source/blender/bmesh/CMakeLists.txt index ae2400b6cdc..c41b0703240 100644 --- a/source/blender/bmesh/CMakeLists.txt +++ b/source/blender/bmesh/CMakeLists.txt @@ -113,8 +113,6 @@ set(SRC tools/bmesh_decimate.h tools/bmesh_edgesplit.c tools/bmesh_edgesplit.h - tools/bmesh_triangulate.c - tools/bmesh_triangulate.h bmesh.h bmesh_class.h diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index 25408961dc5..db2023b7364 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -142,7 +142,7 @@ static int fluid_is_animated_mesh(FluidsimSettings *fss) #if 0 /* helper function */ -void fluidsimGetGeometryObjFilename(Object *ob, char *dst) { //, char *srcname) +void fluidsimGetGeometryObjFilename(Object *ob, char *dst) //, char *srcname) { //BLI_snprintf(dst, FILE_MAXFILE, "%s_cfgdata_%s.bobj.gz", srcname, ob->id.name); BLI_snprintf(dst, FILE_MAXFILE, "fluidcfgdata_%s.bobj.gz", ob->id.name); diff --git a/source/blender/editors/space_sequencer/space_sequencer.c b/source/blender/editors/space_sequencer/space_sequencer.c index 436b649f3b1..d541e1d6c07 100644 --- a/source/blender/editors/space_sequencer/space_sequencer.c +++ b/source/blender/editors/space_sequencer/space_sequencer.c @@ -308,7 +308,8 @@ static void sequencer_refresh(const bContext *C, ScrArea *sa) } } -static SpaceLink *sequencer_duplicate(SpaceLink *sl){ +static SpaceLink *sequencer_duplicate(SpaceLink *sl) +{ SpaceSeq *sseqn = MEM_dupallocN(sl); /* clear or remove stuff from old */ diff --git a/source/blender/imbuf/intern/cineon/cineonlib.c b/source/blender/imbuf/intern/cineon/cineonlib.c index 3049a5be514..b858251a6b9 100644 --- a/source/blender/imbuf/intern/cineon/cineonlib.c +++ b/source/blender/imbuf/intern/cineon/cineonlib.c @@ -50,7 +50,8 @@ static int verbose = 0; -void cineonSetVerbose(int verbosity) { +void cineonSetVerbose(int verbosity) +{ verbose = verbosity; } diff --git a/source/blender/imbuf/intern/cineon/dpxlib.c b/source/blender/imbuf/intern/cineon/dpxlib.c index 4c9b5e620dd..aeebf46a632 100644 --- a/source/blender/imbuf/intern/cineon/dpxlib.c +++ b/source/blender/imbuf/intern/cineon/dpxlib.c @@ -48,7 +48,8 @@ static int verbose = 0; -void dpxSetVerbose(int verbosity) { +void dpxSetVerbose(int verbosity) +{ verbose = verbosity; } -- cgit v1.2.3