diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-12-07 21:17:39 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-12-07 21:17:39 +0300 |
| commit | fc69c54c4ce810e6236eaa45017130f27ba3f1e2 (patch) | |
| tree | 36366184ce3588f2986bda8f6ba18a96b2be1a9a /source/blender/editors/space_view3d/drawobject.c | |
| parent | 1962afa2a6273511268246601659b74c418b6e8e (diff) | |
Particles: bugfixes
* Don't show Apply as Shape for particle modifiers.
* Fix particles disappearing after exiting particle mode.
* Fix free edit not redrawing the 3d view.
* Fix use of uninitialized variable in layers template.
Diffstat (limited to 'source/blender/editors/space_view3d/drawobject.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 7bc86f6bae7..fa8eee630aa 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -5920,8 +5920,9 @@ 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(edit && edit->psys == psys) - draw_update_ptcache_edit(scene, ob, edit); + if(ob->mode & OB_MODE_PARTICLE_EDIT && ob==OBACT) + if(edit && edit->psys == psys) + draw_update_ptcache_edit(scene, ob, edit); draw_new_particle_system(scene, v3d, rv3d, base, psys, dt); } |