diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2008-05-07 12:59:43 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2008-05-07 12:59:43 +0400 |
| commit | f969d560c0a029c874891af1e276ac95df1309b0 (patch) | |
| tree | 205ce410997e02bc33fa52c35bbe4fde15b747b7 /source/blender/src/drawobject.c | |
| parent | 7fbf8080e6d1b3c4a93b7ab2b6026c4e1720ad95 (diff) | |
svn merge -r 14688:HEAD
Diffstat (limited to 'source/blender/src/drawobject.c')
| -rw-r--r-- | source/blender/src/drawobject.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/src/drawobject.c b/source/blender/src/drawobject.c index e9a6395579e..c5b7c874e6e 100644 --- a/source/blender/src/drawobject.c +++ b/source/blender/src/drawobject.c @@ -2526,19 +2526,23 @@ static void draw_mesh_fancy(Base *base, int dt, int flag) if (draw_wire) { /* If drawing wire and drawtype is not OB_WIRE then we are * overlaying the wires. + * + * UPDATE bug #10290 - With this wire-only objects can draw + * behind other objects depending on their order in the scene. 2x if 0's below. undo'ing zr's commit: r4059 */ - +#if 0 if (dt!=OB_WIRE) { bglPolygonOffset(1.0); glDepthMask(0); // disable write in zbuffer, selected edge wires show better } - +#endif dm->drawEdges(dm, (dt==OB_WIRE || totface==0)); - +#if 0 if (dt!=OB_WIRE) { glDepthMask(1); bglPolygonOffset(0.0); } +#endif } dm->release(dm); |