[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16441] trunk/blender/source/blender/ blenkernel/intern/subsurf_ccg.c: Bugfix for [#17329] Bevel Weights are lost after Subsurf

[Daniel Genrich]

Revision: 16441
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16441
Author:   genscher
Date:     2008-09-09 20:44:10 +0200 (Tue, 09 Sep 2008)

Log Message:
-----------
Bugfix for [#17329] Bevel Weights are lost after Subsurf

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	2008-09-09 18:03:44 UTC (rev 16440)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2008-09-09 18:44:10 UTC (rev 16441)
@@ -700,6 +700,7 @@
 	for(index = 0; index < totedge; index++) {
 		CCGEdge *e = edgeMap2[index];
 		unsigned int flags = 0;
+		char bweight = 0;
 		int edgeIdx = GET_INT_FROM_POINTER(ccgSubSurf_getEdgeEdgeHandle(ss, e));
 
 		if(!ccgSubSurf_getEdgeNumFaces(ss, e)) flags |= ME_LOOSEEDGE;
@@ -710,12 +711,14 @@
 			dm->getEdge(dm, edgeIdx, &origMed);
 
 			flags |= origMed.flag;
+			bweight = origMed.bweight;
 		}
 
 		for(x = 0; x < edgeSize - 1; x++) {
 			med->v1 = getEdgeIndex(ss, e, x, edgeSize);
 			med->v2 = getEdgeIndex(ss, e, x + 1, edgeSize);
 			med->flag = flags;
+			med->bweight = bweight;
 			*origIndex = ccgDM_getEdgeMapIndex(NULL, ss, e);
 			++med;
 			++origIndex;