Template retarget now works with normal conversion (not in Quick mode that is).
authorMartin Poirier <theeth@yahoo.com>
Mon, 17 Nov 2008 21:11:12 +0000 (21:11 +0000)
committerMartin Poirier <theeth@yahoo.com>
Mon, 17 Nov 2008 21:11:12 +0000 (21:11 +0000)
source/blender/src/editarmature_retarget.c
source/blender/src/editarmature_sketch.c

index 23b0ba1d9640e9f8fa203692fc7509dd75602313..c2a64ef017bf06b2af9c53c3fa2995bfb8429798 100644 (file)
@@ -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);
 }
index 45a9238cddca2664a7b2ebe8dd9321dca1a5dd0e..c221cb53e65cbbcf204cbf77c72c253b0a5130c1 100644 (file)
@@ -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);
                        }