[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48694] branches/soc-2012-bratwurst/source /blender/editors/transform/transform.c: disable data interpolation through projectSVdata.

[Antony Riakiotakis]

Revision: 48694
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48694
Author:   psy-fi
Date:     2012-07-06 22:39:28 +0000 (Fri, 06 Jul 2012)
Log Message:
-----------
disable data interpolation through projectSVdata. The function causes
crashes with the new uv transform correction code, probably due to the
already known shrinking effect. I could generalize the data
interpolation function I have written for all custom data but it
requires preprocessing to detect data space islands. I hope I can figure
out a way to fix this properly, possibly using a combination of the two
codes.

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

Modified: branches/soc-2012-bratwurst/source/blender/editors/transform/transform.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/editors/transform/transform.c	2012-07-06 22:05:10 UTC (rev 48693)
+++ branches/soc-2012-bratwurst/source/blender/editors/transform/transform.c	2012-07-06 22:39:28 UTC (rev 48694)
@@ -5008,6 +5008,10 @@
 	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)
@@ -5122,7 +5126,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);