[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [17484] branches/etch-a-ton/source/blender /src: Template retarget now works with normal conversion ( not in Quick mode that is).

[Martin Poirier]

Revision: 17484
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=17484
Author:   theeth
Date:     2008-11-17 22:11:12 +0100 (Mon, 17 Nov 2008)

Log Message:
-----------
Template retarget now works with normal conversion (not in Quick mode that is).

Modified Paths:
--------------
    branches/etch-a-ton/source/blender/src/editarmature_retarget.c
    branches/etch-a-ton/source/blender/src/editarmature_sketch.c

Modified: branches/etch-a-ton/source/blender/src/editarmature_retarget.c
===================================================================
--- branches/etch-a-ton/source/blender/src/editarmature_retarget.c	2008-11-17 21:03:41 UTC (rev 17483)
+++ branches/etch-a-ton/source/blender/src/editarmature_retarget.c	2008-11-17 21:11:12 UTC (rev 17484)
@@ -3082,8 +3082,6 @@
 	
 	RIG_freeRigGraph((BGraph*)template_rigg);
 	RIG_freeRigGraph((BGraph*)rigg);
-
-	BIF_undo_push("Retarget Arc");
 	
 	allqueue(REDRAWVIEW3D, 0);
 }

Modified: branches/etch-a-ton/source/blender/src/editarmature_sketch.c
===================================================================
--- branches/etch-a-ton/source/blender/src/editarmature_sketch.c	2008-11-17 21:03:41 UTC (rev 17483)
+++ branches/etch-a-ton/source/blender/src/editarmature_sketch.c	2008-11-17 21:11:12 UTC (rev 17484)
@@ -1802,7 +1802,15 @@
 	{
 		if (stk->selected == 1)
 		{
-			sk_convertStroke(stk);
+			if (G.scene->toolsettings->bone_sketching_convert == SK_CONVERT_RETARGET)
+			{
+				sk_retargetStroke(stk);
+			}
+			else
+			{
+				sk_convertStroke(stk);
+			}
+			allqueue(REDRAWBUTSEDIT, 0);
 		}
 	}
 }
@@ -2519,8 +2527,8 @@
 				else
 				{
 					sk_convertStroke(stk);
-					BIF_undo_push("Convert Sketch");
 				}
+				BIF_undo_push("Convert Sketch");
 				sk_removeStroke(sketch, stk);
 				allqueue(REDRAWBUTSEDIT, 0);
 			}