[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13555] trunk/blender/source/blender/src/ transform_conversions.c: Bugfix:

[Joshua Leung]

Revision: 13555
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13555
Author:   aligorith
Date:     2008-02-04 02:30:44 +0100 (Mon, 04 Feb 2008)

Log Message:
-----------
Bugfix:

AfterTrans Delete Duplicates feature for Action Editor now doesn't remove duplicates if you cancelled the transform.

Modified Paths:
--------------
    trunk/blender/source/blender/src/transform_conversions.c

Modified: trunk/blender/source/blender/src/transform_conversions.c
===================================================================
--- trunk/blender/source/blender/src/transform_conversions.c	2008-02-04 00:44:31 UTC (rev 13554)
+++ trunk/blender/source/blender/src/transform_conversions.c	2008-02-04 01:30:44 UTC (rev 13555)
@@ -3404,8 +3404,11 @@
 			remake_action_ipos((bAction *)data);
 			
 			/* Do curve cleanups? */
-			if ((G.saction->flag & SACTION_NOTRANSKEYCULL)==0)
+			if ( (G.saction->flag & SACTION_NOTRANSKEYCULL)==0 && 
+			     (cancelled == 0) )
+			{
 				posttrans_action_clean((bAction *)data);
+			}
 			
 			G.saction->flag &= ~SACTION_MOVING;
 		}
@@ -3420,8 +3423,11 @@
 					testhandles_ipocurve(icu);
 				}
 				
-				if ((G.saction->flag & SACTION_NOTRANSKEYCULL)==0)
+				if ( (G.saction->flag & SACTION_NOTRANSKEYCULL)==0 && 
+				     (cancelled == 0) )
+				{
 					posttrans_ipo_clean(key->ipo);
+				}
 			}
 			
 			DAG_object_flush_update(G.scene, OBACT, OB_RECALC_DATA);