[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [45171] trunk/blender/source/blender/ blenkernel/intern/subsurf_ccg.c: Fix #30647: Error in wire drawing of subsurf

Sergey Sharybin sergey.vfx at gmail.com
Mon Mar 26 14:20:56 CEST 2012


Revision: 45171
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=45171
Author:   nazgul
Date:     2012-03-26 12:20:46 +0000 (Mon, 26 Mar 2012)
Log Message:
-----------
Fix #30647: Error in wire drawing of subsurf

Patch by Nicholas Bishop, thanks!

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c

Modified: trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2012-03-26 12:11:38 UTC (rev 45170)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2012-03-26 12:20:46 UTC (rev 45171)
@@ -1490,7 +1490,7 @@
 	}
 }
 
-static void ccgDM_drawEdges(DerivedMesh *dm, int drawLooseEdges, int UNUSED(drawAllEdges))
+static void ccgDM_drawEdges(DerivedMesh *dm, int drawLooseEdges, int drawAllEdges)
 {
 	CCGDerivedMesh *ccgdm = (CCGDerivedMesh*) dm;
 	CCGSubSurf *ss = ccgdm->ss;
@@ -1510,7 +1510,7 @@
 		if (!drawLooseEdges && !ccgSubSurf_getEdgeNumFaces(e))
 			continue;
 
-		if (ccgdm->edgeFlags && !(ccgdm->edgeFlags[j] & ME_EDGEDRAW))
+		if (!drawAllEdges && ccgdm->edgeFlags && !(ccgdm->edgeFlags[j] & ME_EDGEDRAW))
 			continue;
 
 		if (useAging && !(G.f&G_BACKBUFSEL)) {




More information about the Bf-blender-cvs mailing list