diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-02-25 12:37:51 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-02-25 12:37:51 +0400 |
| commit | 57fd1fe00e2ec761c82cdcab9f6ce3c036bff3a0 (patch) | |
| tree | 357c519975d246b5b3b6a3eef6ab3545ecd7b382 | |
| parent | 2d8227f20400767bcf0fbb0877a055534d8a99ff (diff) | |
remove redundant NULL check in draw_new_particle_system()
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 497296748c6..1c666e7eda5 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -4131,8 +4131,9 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv { Object *ob=base->object; ParticleEditSettings *pset = PE_settings(scene); - ParticleSettings *part; - ParticleData *pars, *pa; + ParticleSettings *part = psys->part; + ParticleData *pars = psys->particles; + ParticleData *pa; ParticleKey state, *states=NULL; ParticleBillboardData bb; ParticleSimulationData sim= {NULL}; @@ -4150,12 +4151,6 @@ static void draw_new_particle_system(Scene *scene, View3D *v3d, RegionView3D *rv unsigned char tcol[4]= {0, 0, 0, 255}; /* 1. */ - if (psys==NULL) - return; - - part=psys->part; - pars=psys->particles; - if (part==NULL || !psys_check_enabled(ob, psys)) return; |