bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

fix for own error in recent solitify refactor (r57402), face flip check was incorrect.

Browse Source
This commit is contained in:
Campbell Barton 2013-06-14 16:10:32 +00:00
parent aa8f621dd9
commit 9161a4daa5
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/util/util_opencl.cpp
View File

@ -333,3 +333,5 @@ const char *clErrorString(cl_int error)
CCL_NAMESPACE_END
#ifdef CLCC_DYNLIB_CLOSE
#endif

13
source/blender/modifiers/intern/MOD_solidify.c
View File

@ -310,22 +310,19 @@ static DerivedMesh *applyModifier(
}
for (i = 0, mp = orig_mpoly; i < numFaces; i++, mp++) {
unsigned int ml_v1;
unsigned int ml_v2;
int j;
ml = orig_mloop + mp->loopstart;
for (j = 0, ml_v2 = ml[mp->totloop - 1].v;
j < mp->totloop;
j++, ml++, ml_v2 = ml_v1)
{
ml_v1 = ml->v;
for (j = 0; j < mp->totloop; j++, ml++) {
/* add edge user */
eidx = ml->e;
if (edge_users[eidx] == INVALID_UNUSED) {
unsigned int ml_v_next = (j + 1 != mp->totloop) ? ml[1].v : ml[-j].v;
ed = orig_medge + eidx;
edge_users[eidx] = (ml_v1 < ml_v2) == (ed->v1 < ed->v2) ? i : (i + numFaces);
BLI_assert(ELEM(ml->v, ed->v1, ed->v2) &&
ELEM(ml_v_next, ed->v1, ed->v2));
edge_users[eidx] = (ml->v > ml_v_next) == (ed->v1 < ed->v2) ? i : (i + numFaces);
edge_order[eidx] = j;
}
else {