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/drawmesh.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/drawmesh.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawmesh.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index 92c8b8f0b69..5eb7caf50f1 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -478,7 +478,7 @@ void draw_mesh_text(Scene *scene, Object *ob, int glsl) return; /* don't draw when editing */ - if(me->edit_mesh) + if(ob == scene->obedit) return; else if(ob==OBACT) if(FACESEL_PAINT_TEST) @@ -558,7 +558,7 @@ void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *o /* draw the textured mesh */ draw_textured_begin(scene, v3d, rv3d, ob); - if(me->edit_mesh) { + if(ob == scene->obedit) { dm->drawMappedFacesTex(dm, draw_em_tf_mapped__set_draw, me->edit_mesh); } else if(faceselect) { if(G.f & G_WEIGHTPAINT) @@ -566,8 +566,9 @@ void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *o else dm->drawMappedFacesTex(dm, draw_tface_mapped__set_draw, me); } - else + else { dm->drawFacesTex(dm, draw_tface__set_draw); + } /* draw game engine text hack */ if(get_ob_property(ob, "Text")) @@ -576,7 +577,7 @@ void draw_mesh_textured(Scene *scene, View3D *v3d, RegionView3D *rv3d, Object *o draw_textured_end(); /* draw edges and selected faces over textured mesh */ - if(!me->edit_mesh && faceselect) + if(!(ob == scene->obedit) && faceselect) draw_tfaces3D(rv3d, ob, me, dm); /* reset from negative scale correction */ |