diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2009-10-11 23:06:38 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2009-10-11 23:06:38 +0400 |
| commit | efed73598f7d571aa57468b31748c5777dbfc41f (patch) | |
| tree | d247e7a58bc1abf3cdebbada060e6507d457f83b /source/blender/editors/space_view3d/drawmesh.c | |
| parent | 7ac1c7c89956d5df7f99509917fd933002d2861d (diff) | |
Use OB_MODE_EDIT as a flag everywhere, also fixed a typo which made drawing the set-scene not work right.
Diffstat (limited to 'source/blender/editors/space_view3d/drawmesh.c')
| -rw-r--r-- | source/blender/editors/space_view3d/drawmesh.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/space_view3d/drawmesh.c b/source/blender/editors/space_view3d/drawmesh.c index dbe0844cbe5..365b9ff03f7 100644 --- a/source/blender/editors/space_view3d/drawmesh.c +++ b/source/blender/editors/space_view3d/drawmesh.c @@ -350,7 +350,7 @@ static void draw_textured_begin(Scene *scene, View3D *v3d, RegionView3D *rv3d, O int istex, solidtex= 0; // XXX scene->obedit warning - if(v3d->drawtype==OB_SOLID || (ob->mode==OB_MODE_EDIT && v3d->drawtype!=OB_TEXTURE)) { + if(v3d->drawtype==OB_SOLID || ((ob->mode & OB_MODE_EDIT) && v3d->drawtype!=OB_TEXTURE)) { /* draw with default lights in solid draw mode and edit mode */ solidtex= 1; Gtexdraw.islit= -1; @@ -561,7 +561,7 @@ void draw_mesh_text(Scene *scene, Object *ob, int glsl) return; /* don't draw when editing */ - if(ob->mode==OB_MODE_EDIT) + if(ob->mode & OB_MODE_EDIT) return; else if(ob==OBACT) if(paint_facesel_test(ob)) @@ -641,7 +641,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(ob->mode==OB_MODE_EDIT) { + if(ob->mode & OB_MODE_EDIT) { glColor4f(1.0f,1.0f,1.0f,1.0f); dm->drawMappedFacesTex(dm, draw_em_tf_mapped__set_draw, me->edit_mesh); } else if(faceselect) { |