diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2009-12-26 02:51:29 +0300 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2009-12-26 02:51:29 +0300 |
| commit | fc066a6a5d01718981c9dcae23c5f4f47f3d7b1e (patch) | |
| tree | 239042728e0a5f846ce95a967824aa1bc6288cb8 /source/blender/makesdna/DNA_particle_types.h | |
| parent | 99e3423a500d59e3493c4e8db8665c97aa02e110 (diff) | |
Fix for [#20458] Segmentation fault when trying to enable Hair dynamics
* The hair mesh vertex index was stored as a short, but vertex counts can easily go higher than what fits in a short so changed this to an int.
* Also removed particle life looping, which didn't work correctly anyways. Similar functionality will become available when I get to recoding reactor particles into a better system.
Diffstat (limited to 'source/blender/makesdna/DNA_particle_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_particle_types.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_particle_types.h b/source/blender/makesdna/DNA_particle_types.h index 81510ef96a3..abcdbcefc0f 100644 --- a/source/blender/makesdna/DNA_particle_types.h +++ b/source/blender/makesdna/DNA_particle_types.h @@ -109,10 +109,9 @@ typedef struct ParticleData { float size; /* size and multiplier so that we can update size when ever */ + int hair_index; short flag; short alive; /* the life state of a particle */ - short loop; /* how many times particle life has looped */ - short hair_index; } ParticleData; typedef struct ParticleSettings { @@ -261,7 +260,7 @@ typedef struct ParticleSystem{ /* note, make sure all (runtime) are NULL's in #define PART_REACT_STA_END 1 #define PART_REACT_MULTIPLE 2 -#define PART_LOOP 4 +//#define PART_LOOP 4 /* not used anymore */ /* for dopesheet */ #define PART_DS_EXPAND 8 |