diff options
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_lattice_types.h | 4 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_particle_types.h | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/source/blender/makesdna/DNA_lattice_types.h b/source/blender/makesdna/DNA_lattice_types.h index 837f0c354e6..242d6f0feeb 100644 --- a/source/blender/makesdna/DNA_lattice_types.h +++ b/source/blender/makesdna/DNA_lattice_types.h @@ -68,10 +68,6 @@ typedef struct Lattice { struct MDeformVert *dvert; char vgroup[64]; /* multiply the influence, MAX_VGROUP_NAME */ - /* used while deforming, always free and NULL after use */ - float *latticedata; - float latmat[4][4]; - struct EditLatt *editlatt; } Lattice; diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h index 29fcaf3bf73..b7ca3066b4f 100644 --- a/source/blender/makesdna/DNA_particle_types.h +++ b/source/blender/makesdna/DNA_particle_types.h @@ -272,7 +272,9 @@ typedef struct ParticleSystem { struct DerivedMesh *hair_in_dm, *hair_out_dm; /* input/output for cloth simulation */ struct Object *target_ob; - struct Object *lattice; + + struct LatticeDeformData *lattice_deform_data; /* run-time only lattice deformation data */ + struct Object *parent; /* particles from global space -> parent space */ struct ListBase targets; /* used for keyed and boid physics */ |