[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48700] branches/soc-2012-bratwurst/source /blender/editors/transform: Revert previous commit and fix crash.

[Antony Riakiotakis]

Revision: 48700
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48700
Author:   psy-fi
Date:     2012-07-07 01:05:41 +0000 (Sat, 07 Jul 2012)
Log Message:
-----------
Revert previous commit and fix crash. Found the cause on MinGW since it
won't excuse uninitialized variables. projectSVdata still does the wrong
thing, better fix it than disable it though.

Modified Paths:
--------------
    branches/soc-2012-bratwurst/source/blender/editors/transform/transform.c
    branches/soc-2012-bratwurst/source/blender/editors/transform/transform_generics.c

Modified: branches/soc-2012-bratwurst/source/blender/editors/transform/transform.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/editors/transform/transform.c	2012-07-07 00:26:50 UTC (rev 48699)
+++ branches/soc-2012-bratwurst/source/blender/editors/transform/transform.c	2012-07-07 01:05:41 UTC (rev 48700)
@@ -5008,10 +5008,6 @@
 	if (!(t->settings->uvcalc_flag & UVCALC_TRANSFORM_CORRECT))
 		return;
 
-	/* temporary until we decide what to do with data interpolation */
-	if(!final)
-		return;
-
 	/* don't do this at all for non-basis shape keys, too easy to
 	 * accidentally break uv maps or vertex colors then */
 	if (em->bm->shapenr > 1)
@@ -5126,7 +5122,7 @@
 
 				/* only loop data, no vertex data since that contains shape keys,
 				 * and we do not want to mess up other shape keys */
-				//BM_loop_interp_from_face(em->bm, l, f_copy_flip, FALSE, FALSE);
+				BM_loop_interp_from_face(em->bm, l, f_copy_flip, FALSE, FALSE);
 
 				if (final) {
 					BM_loop_interp_multires(em->bm, l, f_copy_flip);

Modified: branches/soc-2012-bratwurst/source/blender/editors/transform/transform_generics.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/editors/transform/transform_generics.c	2012-07-07 00:26:50 UTC (rev 48699)
+++ branches/soc-2012-bratwurst/source/blender/editors/transform/transform_generics.c	2012-07-07 01:05:41 UTC (rev 48700)
@@ -1813,7 +1813,7 @@
 			UVTransCorrInfoUV *first_island_uv, *uvtcuv;
 			float projv[3], proj_len;
 			float min_angles[2] = {-10.0, -10.0} /* arbitrary, just bigger than 2PI */;
-			BMLoop *boundary_loops[2];
+			BMLoop *boundary_loops[2] = {NULL, NULL};
 			int index;
 			BMVert *v = td[i].eve;
 			index = BM_elem_index_get(v);