[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46125] trunk/blender/source/blender/ blenkernel/intern/subsurf_ccg.c: Fix #31164: constructive modifier followed by subsurf modifier did not show

[Brecht Van Lommel]

Revision: 46125
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46125
Author:   blendix
Date:     2012-04-30 16:29:01 +0000 (Mon, 30 Apr 2012)
Log Message:
-----------
Fix #31164: constructive modifier followed by subsurf modifier did not show
face smoothing flags correctly. In fact it would do an invalid memory access,
using the -1 original index.

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-04-30 16:22:40 UTC (rev 46124)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2012-04-30 16:29:01 UTC (rev 46125)
@@ -3134,8 +3134,6 @@
 		float *w2;
 		int s, x, y;
 		
-		origIndex = base_polyOrigIndex ? base_polyOrigIndex[origIndex] : origIndex;
-		
 		w = get_ss_weights(&wtable, gridCuts, numVerts);
 
 		ccgdm->faceMap[index].startVert = vertNum;
@@ -3146,6 +3144,8 @@
 		faceFlags->mat_nr = mpoly ? mpoly[origIndex].mat_nr : 0;
 		faceFlags++;
 
+		origIndex = base_polyOrigIndex ? base_polyOrigIndex[origIndex] : origIndex;
+
 		/* set the face base vert */
 		*((int *)ccgSubSurf_getFaceUserData(ss, f)) = vertNum;