[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [57458] trunk/blender: fix for own error in recent solitify refactor (r57402), face flip check was incorrect.

[Campbell Barton]

Revision: 57458
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57458
Author:   campbellbarton
Date:     2013-06-14 16:10:32 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
fix for own error in recent solitify refactor (r57402), face flip check was incorrect.

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=57402

Modified Paths:
--------------
    trunk/blender/intern/cycles/util/util_opencl.cpp
    trunk/blender/source/blender/modifiers/intern/MOD_solidify.c

Modified: trunk/blender/intern/cycles/util/util_opencl.cpp
===================================================================
--- trunk/blender/intern/cycles/util/util_opencl.cpp	2013-06-14 15:48:03 UTC (rev 57457)
+++ trunk/blender/intern/cycles/util/util_opencl.cpp	2013-06-14 16:10:32 UTC (rev 57458)
@@ -333,3 +333,5 @@
 
 CCL_NAMESPACE_END
 
+#ifdef CLCC_DYNLIB_CLOSE
+#endif

Modified: trunk/blender/source/blender/modifiers/intern/MOD_solidify.c
===================================================================
--- trunk/blender/source/blender/modifiers/intern/MOD_solidify.c	2013-06-14 15:48:03 UTC (rev 57457)
+++ trunk/blender/source/blender/modifiers/intern/MOD_solidify.c	2013-06-14 16:10:32 UTC (rev 57458)
@@ -310,22 +310,19 @@
 		}
 
 		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 {