[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55255] trunk/blender/source/blender/ blenkernel/intern/subsurf_ccg.c: Fix #34526: crash using mask modifier + subsurf + UV map.

[Brecht Van Lommel]

Revision: 55255
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55255
Author:   blendix
Date:     2013-03-13 22:15:59 +0000 (Wed, 13 Mar 2013)
Log Message:
-----------
Fix #34526: crash using mask modifier + subsurf + UV map.

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	2013-03-13 20:00:39 UTC (rev 55254)
+++ trunk/blender/source/blender/blenkernel/intern/subsurf_ccg.c	2013-03-13 22:15:59 UTC (rev 55255)
@@ -3304,8 +3304,6 @@
 		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;
 
@@ -3413,7 +3411,7 @@
 						faceOrigIndex++;
 					}
 					if (polyOrigIndex) {
-						*polyOrigIndex = origIndex;
+						*polyOrigIndex = base_polyOrigIndex ? base_polyOrigIndex[origIndex] : origIndex;
 						polyOrigIndex++;
 					}