diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2008-09-16 22:40:54 +0400 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2008-09-16 22:40:54 +0400 |
| commit | 0922ecee93e09e0d608710a0e82258ecaba949d1 (patch) | |
| tree | 37db8b660e6ad314a7bb5a150316595837d30590 /source/blender/blenkernel/intern/particle.c | |
| parent | 80458f69b29685559c045b068a4383a7684df50c (diff) | |
"Fix" for #17636 Crashing bug - won't open a file
- The cause was indeed corrupted particle settings which should have caused a deletion of the whole particle system. However the particle modifier was still left and that led to the crash.
- A "fix" because there's really no way of knowing what caused the corruption of the particle settings. If anyone else gets this and can recreate I'd love to get a .blend. Now that there shouldn't be a crash anymore the symptom will be a missing particle system after file load in an object that had a particle system before.
Diffstat (limited to 'source/blender/blenkernel/intern/particle.c')
| -rw-r--r-- | source/blender/blenkernel/intern/particle.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 2678608fb9a..c9d16c0017f 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -296,7 +296,7 @@ int psys_check_enabled(Object *ob, ParticleSystem *psys) ParticleSystemModifierData *psmd; Mesh *me; - if(psys->flag & PSYS_DISABLED) + if(psys->flag & PSYS_DISABLED || psys->flag & PSYS_DELETE) return 0; if(ob->type == OB_MESH) { |