diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-03-31 07:28:46 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-03-31 07:28:46 +0400 |
| commit | e8d532f1dde96c40c1407d39260724fcfee0b606 (patch) | |
| tree | 36264f1310ab0dd9af959d09373e7ad6a5e13126 /source/blender/editors/physics | |
| parent | 2c58e96685e80e4e12dfad56ed3bb51fa3824197 (diff) | |
style cleanup
Diffstat (limited to 'source/blender/editors/physics')
| -rw-r--r-- | source/blender/editors/physics/particle_edit.c | 6 | ||||
| -rw-r--r-- | source/blender/editors/physics/physics_fluid.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c index e972b7d6620..f00295a9033 100644 --- a/source/blender/editors/physics/particle_edit.c +++ b/source/blender/editors/physics/particle_edit.c @@ -2287,13 +2287,13 @@ static void subdivide_particle(PEData *data, int pa_index) nekey++; if (ekey->flag & PEK_SELECT && (ekey+1)->flag & PEK_SELECT) { - nkey->time= (key->time + (key+1)->time)*0.5f; - state.time= (endtime != 0.0f)? nkey->time/endtime: 0.0f; + nkey->time = (key->time + (key + 1)->time) * 0.5f; + state.time = (endtime != 0.0f) ? nkey->time / endtime: 0.0f; psys_get_particle_on_path(&sim, pa_index, &state, 0); copy_v3_v3(nkey->co, state.co); nekey->co= nkey->co; - nekey->time= &nkey->time; + nekey->time = &nkey->time; nekey->flag |= PEK_SELECT; if (!(psys->flag & PSYS_GLOBAL_HAIR)) nekey->flag |= PEK_USE_WCO; diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c index df723b06259..8fe3eb66c67 100644 --- a/source/blender/editors/physics/physics_fluid.c +++ b/source/blender/editors/physics/physics_fluid.c @@ -528,7 +528,7 @@ static void export_fluid_objects(ListBase *fobjects, Scene *scene, int length) if ( ELEM(fsmesh.type, OB_FLUIDSIM_FLUID, OB_FLUIDSIM_INFLOW)) { fsmesh.channelInitialVel = fobj->InitialVelocity; - fsmesh.localInivelCoords = ((fluidmd->fss->typeFlags & OB_FSINFLOW_LOCALCOORD)?1:0); + fsmesh.localInivelCoords = ((fluidmd->fss->typeFlags & OB_FSINFLOW_LOCALCOORD) ? 1 : 0); } if (fluidmd->fss->typeFlags & OB_FSBND_NOSLIP) |