[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58515] trunk/blender/source/blender/ editors/space_view3d/drawobject.c: hidden-wire draw option: always use the cage when masking out faces otherwise modifiers give odd results .

[Campbell Barton]

Revision: 58515
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58515
Author:   campbellbarton
Date:     2013-07-22 21:45:01 +0000 (Mon, 22 Jul 2013)
Log Message:
-----------
hidden-wire draw option: always use the cage when masking out faces otherwise 
modifiers give odd results.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/space_view3d/drawobject.c

Modified: trunk/blender/source/blender/editors/space_view3d/drawobject.c
===================================================================
--- trunk/blender/source/blender/editors/space_view3d/drawobject.c      
2013-07-22 21:02:45 UTC (rev 58514)
+++ trunk/blender/source/blender/editors/space_view3d/drawobject.c      
2013-07-22 21:45:01 UTC (rev 58515)
@@ -3132,9 +3132,10 @@
        }
        else if (dt > OB_WIRE) {
                if (use_occlude_wire) {
+                       /* use the cageDM since it always overlaps the editmesh 
faces */
                        glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE);
-                       finalDM->drawMappedFaces(finalDM, 
draw_em_fancy__setFaceOpts,
-                                                GPU_enable_material, NULL, 
me->edit_btmesh, 0);
+                       cageDM->drawMappedFaces(cageDM, 
draw_em_fancy__setFaceOpts,
+                                               GPU_enable_material, NULL, 
me->edit_btmesh, 0);
                        glColorMask(GL_TRUE, GL_TRUE, GL_TRUE, GL_TRUE);
                }
                else if (check_object_draw_texture(scene, v3d, dt)) {

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs