diff options
| author | Janne Karhu <jhkarh@gmail.com> | 2010-03-09 06:27:05 +0300 |
|---|---|---|
| committer | Janne Karhu <jhkarh@gmail.com> | 2010-03-09 06:27:05 +0300 |
| commit | c1166642d041639508ad93735b8e5e24daf5f2e6 (patch) | |
| tree | bb41051122e0c8529d8d391a260fe8aababd7676 /source/blender/editors/space_view3d/drawobject.c | |
| parent | 979aa4e9904017144b049f90ff14a6cc928b437d (diff) | |
Fix for: [#21105] comb mode - bug with "free edit"
Diffstat (limited to 'source/blender/editors/space_view3d/drawobject.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index ac1e13a6510..09cbdd0c221 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -5704,7 +5704,6 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag) (ob!=scene->obedit) ) { ParticleSystem *psys; - PTCacheEdit *edit = PE_get_current(scene, ob); if(col || (ob->flag & SELECT)) cpack(0xFFFFFF); /* for visibility, also while wpaint */ //glDepthMask(GL_FALSE); @@ -5715,9 +5714,11 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag) for(psys=ob->particlesystem.first; psys; psys=psys->next) { /* run this so that possible child particles get cached */ - if(ob->mode & OB_MODE_PARTICLE_EDIT && ob==OBACT) + if(ob->mode & OB_MODE_PARTICLE_EDIT && ob==OBACT) { + PTCacheEdit *edit = PE_create_current(scene, ob); if(edit && edit->psys == psys) draw_update_ptcache_edit(scene, ob, edit); + } draw_new_particle_system(scene, v3d, rv3d, base, psys, dt); } @@ -5737,7 +5738,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag) ) { if(ob->mode & OB_MODE_PARTICLE_EDIT && ob==OBACT) { - PTCacheEdit *edit = PE_get_current(scene, ob); + PTCacheEdit *edit = PE_create_current(scene, ob); if(edit) { glLoadMatrixf(rv3d->viewmat); draw_ptcache_edit(scene, v3d, rv3d, ob, edit, dt); |