sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Bugfix for [#17329] Bevel Weights are lost after Subsurf

Browse Source
This commit is contained in:
Daniel Genrich 2008-09-09 18:44:10 +00:00
parent be19db6854
commit 568ba15726
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/intern/subsurf_ccg.c
View File

@ -700,6 +700,7 @@ DerivedMesh *ss_to_cdderivedmesh(CCGSubSurf *ss, int ssFromEditmesh,
for(index = 0; index < totedge; index++) { for(index = 0; index < totedge; index++) {
CCGEdge *e = edgeMap2[index]; CCGEdge *e = edgeMap2[index];
unsigned int flags = 0; unsigned int flags = 0;
char bweight = 0;
int edgeIdx = GET_INT_FROM_POINTER(ccgSubSurf_getEdgeEdgeHandle(ss, e)); int edgeIdx = GET_INT_FROM_POINTER(ccgSubSurf_getEdgeEdgeHandle(ss, e));
if(!ccgSubSurf_getEdgeNumFaces(ss, e)) flags |= ME_LOOSEEDGE; if(!ccgSubSurf_getEdgeNumFaces(ss, e)) flags |= ME_LOOSEEDGE;
@ -710,12 +711,14 @@ DerivedMesh *ss_to_cdderivedmesh(CCGSubSurf *ss, int ssFromEditmesh,
dm->getEdge(dm, edgeIdx, &origMed); dm->getEdge(dm, edgeIdx, &origMed);
flags |= origMed.flag; flags |= origMed.flag;
bweight = origMed.bweight;
} }
for(x = 0; x < edgeSize - 1; x++) { for(x = 0; x < edgeSize - 1; x++) {
med->v1 = getEdgeIndex(ss, e, x, edgeSize); med->v1 = getEdgeIndex(ss, e, x, edgeSize);
med->v2 = getEdgeIndex(ss, e, x + 1, edgeSize); med->v2 = getEdgeIndex(ss, e, x + 1, edgeSize);
med->flag = flags; med->flag = flags;
med->bweight = bweight;
*origIndex = ccgDM_getEdgeMapIndex(NULL, ss, e); *origIndex = ccgDM_getEdgeMapIndex(NULL, ss, e);
++med; ++med;
++origIndex; ++origIndex;