diff options
| author | Antony Riakiotakis <kalast@gmail.com> | 2013-08-26 18:58:16 +0400 |
|---|---|---|
| committer | Antony Riakiotakis <kalast@gmail.com> | 2013-08-26 18:58:16 +0400 |
| commit | 1ff96dc6c912c04c0649e67ad96d7174cc527866 (patch) | |
| tree | 587fc45ebfe16198d9cacc8a5bcfcec15fe003b9 | |
| parent | 52216889c0802a730f7c57160d978af12e2ff5aa (diff) | |
Don't check for an object mode that is excluded as a prerequisite for
entering this branch of code.
| -rw-r--r-- | source/blender/editors/space_view3d/drawobject.c | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/source/blender/editors/space_view3d/drawobject.c b/source/blender/editors/space_view3d/drawobject.c index e84d21c806d..ac216907c7f 100644 --- a/source/blender/editors/space_view3d/drawobject.c +++ b/source/blender/editors/space_view3d/drawobject.c @@ -6656,23 +6656,17 @@ void draw_object(Scene *scene, ARegion *ar, View3D *v3d, Base *base, const short /* faceselect exception: also draw solid when (dt == wire), except in editmode */ if (is_obact && (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT | OB_MODE_TEXTURE_PAINT))) { - if (ob->type == OB_MESH) { - - if (ob->mode & OB_MODE_EDIT) { - /* pass */ + if (ob->type == OB_MESH) { + if (dt < OB_SOLID) { + zbufoff = 1; + dt = OB_SOLID; } - else { - if (dt < OB_SOLID) { - zbufoff = 1; - dt = OB_SOLID; - } - - if (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT)) { - dt = OB_PAINT; - } - glEnable(GL_DEPTH_TEST); + if (ob->mode & (OB_MODE_VERTEX_PAINT | OB_MODE_WEIGHT_PAINT)) { + dt = OB_PAINT; } + + glEnable(GL_DEPTH_TEST); } else { if (dt < OB_SOLID) { |