diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-02-20 23:39:27 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-02-20 23:39:27 +0300 |
| commit | ebd2b1212de7bfc1fabb3af114e954beefd0798c (patch) | |
| tree | c5aa448df9f03375566fbc019cb83477f992d9a7 /source/blender/editors/space_view3d/drawobject.c | |
| parent | 39c2b438a9490468625bd047fdf7b4c02c5348ef (diff) | |
2.5: Particle Edit, work in progress commit.
* Still incomplete and some operators don't work, refresh issues, etc.
* Made Hide/Reveal operators consistent for various modes.
Diffstat (limited to 'source/blender/editors/space_view3d/drawobject.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 7df8f3a75db..f9a5195860d 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -98,7 +98,7 @@ #include "GPU_material.h" #include "GPU_extensions.h" -#include "ED_editparticle.h" +#include "ED_particle.h" #include "ED_mesh.h" #include "ED_types.h" #include "ED_util.h" @@ -5086,7 +5086,7 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, int flag) draw_new_particle_system(scene, v3d, rv3d, base, psys, dt); if(G.f & G_PARTICLEEDIT && ob==OBACT) { - psys= PE_get_current(ob); + psys= PE_get_current(scene, ob); if(psys && !scene->obedit && psys_in_edit_mode(scene, psys)) draw_particle_edit(scene, v3d, rv3d, ob, psys, dt); } |