diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-05-07 23:25:43 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2008-05-07 23:25:43 +0400 |
commit | 1584d6a0069758d8b594b0e2c412677ab5a8f22f (patch) | |
tree | 4a44375539b720d3d7313149f472d7e24ccd64fe /source/blender/makesdna/DNA_particle_types.h | |
parent | 5da47ddd02352a0860be5899c3d03734e44d0151 (diff) |
Possible fix for #9691: blender failing to allocate memory when rendering
particles on windows, now allocates smaller chunks of memory.
Diffstat (limited to 'source/blender/makesdna/DNA_particle_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_particle_types.h | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h index 8122cdd9cc7..e5f781a3365 100644 --- a/source/blender/makesdna/DNA_particle_types.h +++ b/source/blender/makesdna/DNA_particle_types.h @@ -171,24 +171,24 @@ typedef struct ParticleSettings { typedef struct ParticleSystem{ struct ParticleSystem *next, *prev; - ParticleSettings *part; + ParticleSettings *part; /* particle settings */ - ParticleData *particles; + ParticleData *particles; /* (parent) particles */ + ChildParticle *child; /* child particles */ - ChildParticle *child; + struct ParticleEdit *edit; /* particle editmode (runtime) */ - struct ParticleEdit *edit; + struct ParticleCacheKey **pathcache; /* path cache (runtime) */ + struct ParticleCacheKey **childcache; /* child cache (runtime) */ + ListBase pathcachebufs, childcachebufs; /* buffers for the above */ - struct ParticleCacheKey **pathcache; - struct ParticleCacheKey **childcache; - - struct SoftBody *soft; + struct SoftBody *soft; /* hair softbody */ struct Object *target_ob; struct Object *keyed_ob; struct Object *lattice; - struct ListBase effectors, reactevents; + struct ListBase effectors, reactevents; /* runtime */ float imat[4][4]; /* used for duplicators */ float cfra; @@ -196,10 +196,10 @@ typedef struct ParticleSystem{ int flag, totpart, totchild, totcached, totchildcache, rt; short recalc, target_psys, keyed_psys, totkeyed, softflag, bakespace; - char bb_uvname[3][32]; + char bb_uvname[3][32]; /* billboard uv name */ /* if you change these remember to update array lengths to PSYS_TOT_VG! */ - short vgroup[11], vg_neg, rt3[2]; + short vgroup[11], vg_neg, rt3[2]; /* vertex groups */ /* temporary storage during render */ void *renderdata; |