diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-02-20 02:53:40 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-02-20 02:53:40 +0300 |
| commit | 8e41a21607231b733ef0f5469be90ca4715e9afa (patch) | |
| tree | a82636932532377a9bb8cdebe63b1b5415f15a1f /source/blender/editors/space_view3d/drawobject.c | |
| parent | 2cb5af58a6cf8120275b37c063899b0234719da2 (diff) | |
2.5:
* Image painting back. 2d paint, 3d paint and projection, undo,
pressure, repeating paint operations, etc should all work.
Drawing cursor needs a bit of work, only gets shown when enabling
texture paint mode now.
* Move sculpt, image paint, and vertex/weight paint into a single
sculpt_paint module. Doesn't make much difference now, but nice
to have it together for better integration and consistency in
the future.
Diffstat (limited to 'source/blender/editors/space_view3d/drawobject.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index 85edf6cf5fb..7df8f3a75db 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -5360,9 +5360,10 @@ void draw_object_backbufsel(Scene *scene, View3D *v3d, RegionView3D *rv3d, Objec switch( ob->type) { case OB_MESH: { - Mesh *me= ob->data; - EditMesh *em= me->edit_mesh; - if(em) { + if(ob == scene->obedit) { + Mesh *me= ob->data; + EditMesh *em= me->edit_mesh; + DerivedMesh *dm = editmesh_get_derived_cage(scene, ob, em, CD_MASK_BAREMESH); EM_init_index_arrays(em, 1, 1, 1); @@ -5415,7 +5416,7 @@ static void draw_object_mesh_instance(Scene *scene, View3D *v3d, RegionView3D *r DerivedMesh *dm=NULL, *edm=NULL; int glsl; - if(me->edit_mesh) + if(ob == scene->obedit) edm= editmesh_get_derived_base(ob, me->edit_mesh); else dm = mesh_get_derived_final(scene, ob, CD_MASK_BAREMESH); |