diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2008-05-29 03:38:40 +0400 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2008-05-29 03:38:40 +0400 |
| commit | a17f322dd0796cc76e1c8f40ce60ddddc990f93e (patch) | |
| tree | 321ea3573e261da6f766fe801ef2f5be8cf6ca1a /source/blender/src/drawobject.c | |
| parent | 1a5181c9c71802309b9947456e528cb5ee644d5e (diff) | |
Bug fix: [#13268] Crash when creating a new particle system
-Ugh.. sorry about that.. damn default cube with it's default material!
Diffstat (limited to 'source/blender/src/drawobject.c')
| -rw-r--r-- | source/blender/src/drawobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c index d2555f355bb..96ba8c71755 100644 --- a/source/blender/src/drawobject.c +++ b/source/blender/src/drawobject.c @@ -3111,7 +3111,7 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys, int dt) pa_time=(cfra-pa->time)/pa->lifetime; if((part->flag&PART_ABS_TIME)==0){ - if(ma->ipo){ + if(ma && ma->ipo){ /* correction for lifetime */ calc_ipo(ma->ipo, 100.0f*pa_time); execute_ipo((ID *)ma, ma->ipo); @@ -3138,7 +3138,7 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys, int dt) pa_time=psys_get_child_time(psys,cpa,cfra); if((part->flag&PART_ABS_TIME)==0) { - if(ma->ipo){ + if(ma && ma->ipo){ /* correction for lifetime */ calc_ipo(ma->ipo, 100.0f*pa_time); execute_ipo((ID *)ma, ma->ipo); |