[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [47846] branches/soc-2012-bratwurst/source /blender/editors/transform: Move transform apply code to recalcData_view3d

[Antony Riakiotakis]

Revision: 47846
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=47846
Author:   psy-fi
Date:     2012-06-13 18:56:31 +0000 (Wed, 13 Jun 2012)
Log Message:
-----------
Move transform apply code to recalcData_view3d

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-06-13 17:34:47 UTC (rev 47845)
+++ branches/soc-2012-bratwurst/source/blender/editors/transform/transform.c	2012-06-13 18:56:31 UTC (rev 47846)
@@ -384,7 +384,7 @@
 			WM_event_add_notifier(C, NC_OBJECT | ND_KEYS, NULL);
 
 		if(t->flag & T_IMAGE_PRESERVE_CALC)
-					WM_event_add_notifier(C, NC_GEOM|ND_DATA, t->obedit->data);
+			WM_event_add_notifier(C, NC_GEOM|ND_DATA, t->obedit->data);
 	}
 	else if (t->spacetype == SPACE_ACTION) {
 		//SpaceAction *saction= (SpaceAction *)t->sa->spacedata.first;
@@ -1884,12 +1884,6 @@
 		viewRedrawForce(C, t);
 	}
 
-	/* stay here for now, maybe will find some other way to aviod duplicating in every transform
-	 * apply funtion */
-	if(t->flag & T_IMAGE_PRESERVE_CALC) {
-		calculateUVTransformCorrection(t);
-	}
-
 	/* If auto confirm is on, break after one pass */
 	if (t->options & CTX_AUTOCONFIRM) {
 		t->state = TRANS_CONFIRM;

Modified: branches/soc-2012-bratwurst/source/blender/editors/transform/transform_generics.c
===================================================================
--- branches/soc-2012-bratwurst/source/blender/editors/transform/transform_generics.c	2012-06-13 17:34:47 UTC (rev 47845)
+++ branches/soc-2012-bratwurst/source/blender/editors/transform/transform_generics.c	2012-06-13 18:56:31 UTC (rev 47846)
@@ -738,7 +738,13 @@
 			}
 			if ((t->options & CTX_NO_MIRROR) == 0 && (t->flag & T_MIRROR))
 				editbmesh_apply_to_mirror(t);
-				
+
+			/* stay here for now, maybe will find some other way to avoid duplicating in every transform
+			 * apply funtion */
+			if(t->flag & T_IMAGE_PRESERVE_CALC) {
+				calculateUVTransformCorrection(t);
+			}
+
 			DAG_id_tag_update(t->obedit->data, 0);  /* sets recalc flags */
 			
 			EDBM_mesh_normals_update(em);