diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-12-18 05:46:15 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-12-18 05:46:15 +0400 |
| commit | 899ba3fdb619034653ad59dfae6c8eec9f443933 (patch) | |
| tree | b3715d873f54a71a3449424cfee47e12b34bab17 /source/blender/blenkernel | |
| parent | 779375251c51fa843337d6340e7d14959e620abe (diff) | |
style cleanup
Diffstat (limited to 'source/blender/blenkernel')
| -rw-r--r-- | source/blender/blenkernel/intern/object.c | 2 | ||||
| -rw-r--r-- | source/blender/blenkernel/intern/particle_system.c | 13 |
2 files changed, 9 insertions, 6 deletions
diff --git a/source/blender/blenkernel/intern/object.c b/source/blender/blenkernel/intern/object.c index 56af4267ec7..28aa3a523cd 100644 --- a/source/blender/blenkernel/intern/object.c +++ b/source/blender/blenkernel/intern/object.c @@ -1570,7 +1570,7 @@ void BKE_object_rot_to_mat3(Object *ob, float mat[3][3], short use_drot) } /* combine these rotations */ - if(use_drot) + if (use_drot) mul_m3_m3m3(mat, dmat, rmat); else copy_m3_m3(mat, rmat); diff --git a/source/blender/blenkernel/intern/particle_system.c b/source/blender/blenkernel/intern/particle_system.c index 037864c7e38..26bdc751582 100644 --- a/source/blender/blenkernel/intern/particle_system.c +++ b/source/blender/blenkernel/intern/particle_system.c @@ -2413,7 +2413,8 @@ static void sph_evaluate_func(BVHTree *tree, ParticleSystem **psys, float co[3], if (tree) { BLI_bvhtree_range_query(tree, co, interaction_radius, callback, pfr); break; - } else { + } + else { BLI_bvhtree_range_query(psys[i]->bvhtree, co, interaction_radius, callback, pfr); } } @@ -2815,7 +2816,8 @@ void psys_sph_init(ParticleSimulationData *sim, SPHData *sphdata) sphdata->force_cb = sph_force_cb; sphdata->density_cb = sph_density_accum_cb; sphdata->hfac = 1.0f; - } else { + } + else { /* SPH_SOLVER_CLASSICAL */ sphdata->force_cb = sphclassical_force_cb; sphdata->density_cb = sphclassical_density_accum_cb; @@ -4221,7 +4223,7 @@ static void dynamics_step(ParticleSimulationData *sim, float cfra) /* actual fluids calculations */ sph_integrate(sim, pa, pa->state.time, &sphdata); - if(sim->colliders) + if (sim->colliders) collision_check(sim, p, pa->state.time, cfra); /* SPH particles are not physical particles, just interpolation @@ -4235,7 +4237,8 @@ static void dynamics_step(ParticleSimulationData *sim, float cfra) sph_springs_modify(psys, timestep); - } else { + } + else { /* SPH_SOLVER_CLASSICAL */ /* Apply SPH forces using classical algorithm (due to Gingold * and Monaghan). Note that, unlike double-density relaxation, @@ -4258,7 +4261,7 @@ static void dynamics_step(ParticleSimulationData *sim, float cfra) /* actual fluids calculations */ sph_integrate(sim, pa, pa->state.time, &sphdata); - if(sim->colliders) + if (sim->colliders) collision_check(sim, p, pa->state.time, cfra); /* SPH particles are not physical particles, just interpolation |