diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-04-27 22:26:20 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-04-27 22:26:20 +0400 |
| commit | 57c1fbe5579b786ee24e58ad1d67ca5ad0625f76 (patch) | |
| tree | 6c938654ad84f0f126dc925d9a5b625340be0ef4 /source/blender/blenkernel/intern/DerivedMesh.c | |
| parent | 9ea254ca345585ff6aae0286fa301795dc65ebf2 (diff) | |
remove old particle system.
also removed quat, dquat, and sumohandle from the Object struct since they aren't used anywhere.
Diffstat (limited to 'source/blender/blenkernel/intern/DerivedMesh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/DerivedMesh.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/source/blender/blenkernel/intern/DerivedMesh.c b/source/blender/blenkernel/intern/DerivedMesh.c index fa3e7994ee5..f31c5a0d672 100644 --- a/source/blender/blenkernel/intern/DerivedMesh.c +++ b/source/blender/blenkernel/intern/DerivedMesh.c @@ -420,7 +420,6 @@ static DerivedMesh *getMeshDerivedMesh(Mesh *me, Object *ob, float (*vertCos)[3] dofluidsim = ((ob->fluidsimFlag & OB_FLUIDSIM_ENABLE) && (ob->fluidsimSettings->type & OB_FLUIDSIM_DOMAIN)&& (ob->fluidsimSettings->meshSurface) && - (1) && (!give_parteff(ob)) && // doesnt work together with particle systems! (me->totvert == ((Mesh *)(ob->fluidsimSettings->meshSurface))->totvert)); if (vertCos && !dofluidsim) @@ -1916,8 +1915,7 @@ static void mesh_calc_modifiers(Object *ob, float (*inputVertexCos)[3], * domain objects */ if((G.obedit!=ob) && !needMapping) { - if((ob->fluidsimFlag & OB_FLUIDSIM_ENABLE) && - (1) && (!give_parteff(ob)) ) { // doesnt work together with particle systems! + if((ob->fluidsimFlag & OB_FLUIDSIM_ENABLE)) { if(ob->fluidsimSettings->type & OB_FLUIDSIM_DOMAIN) { loadFluidsimMesh(ob,useRenderParams); fluidsimMeshUsed = 1; @@ -2550,14 +2548,7 @@ void makeDerivedMesh(Object *ob, CustomDataMask dataMask) if (ob==G.obedit) { editmesh_build_data(dataMask); } else { - PartEff *paf= give_parteff(ob); - mesh_build_data(ob, dataMask); - - if(paf) { - if((paf->flag & PAF_STATIC) || (ob->recalc & OB_RECALC_TIME)==0) - build_particle_system(ob); - } } } |