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

2 files changed, 10 insertions, 4 deletions

diff --git a/source/blender/src/editarmature_retarget.c b/source/blender/src/editarmature_retarget.c
index 23b0ba1d964..c2a64ef017b 100644
--- a/source/blender/src/editarmature_retarget.c
+++ b/source/blender/src/editarmature_retarget.c
@@ -3082,8 +3082,6 @@ void BIF_retargetArc(ReebArc *earc)
 	
 	RIG_freeRigGraph((BGraph*)template_rigg);
 	RIG_freeRigGraph((BGraph*)rigg);
-
-	BIF_undo_push("Retarget Arc");
 	
 	allqueue(REDRAWVIEW3D, 0);
 }
diff --git a/source/blender/src/editarmature_sketch.c b/source/blender/src/editarmature_sketch.c
index 45a9238cddc..c221cb53e65 100644
--- a/source/blender/src/editarmature_sketch.c
+++ b/source/blender/src/editarmature_sketch.c
@@ -1802,7 +1802,15 @@ void sk_convert(SK_Sketch *sketch)
 	{
 		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 @@ int sk_paint(SK_Sketch *sketch, short mbut)
 				else
 				{
 					sk_convertStroke(stk);
-					BIF_undo_push("Convert Sketch");
 				}
+				BIF_undo_push("Convert Sketch");
 				sk_removeStroke(sketch, stk);
 				allqueue(REDRAWBUTSEDIT, 0);
 			}