svn merge ^/trunk/blender -r40890:40950

1 files changed, 13 insertions, 7 deletions

diff --git a/source/blender/editors/space_view3d/view3d_snap.c b/source/blender/editors/space_view3d/view3d_snap.c
index a843c67849b..4db7f2085c9 100644
--- a/source/blender/editors/space_view3d/view3d_snap.c
+++ b/source/blender/editors/space_view3d/view3d_snap.c
@@ -67,6 +67,7 @@
 
 #include "ED_armature.h"
 #include "ED_mesh.h"
+#include "ED_keyframing.h"
 #include "ED_screen.h"
 #include "ED_curve.h" /* for curve_editnurbs */
 
@@ -545,6 +546,7 @@ static int snap_sel_to_grid(bContext *C, wmOperator *UNUSED(op))
 	
 	}
 	else {
+		struct KeyingSet *ks = ANIM_get_keyingset_for_autokeying(scene, "Location");
 
 		CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
 			if(ob->mode & OB_MODE_POSE) {
@@ -573,6 +575,9 @@ static int snap_sel_to_grid(bContext *C, wmOperator *UNUSED(op))
 									pchan->loc[0]= vecN[1];
 								if ((pchan->protectflag & OB_LOCK_LOCZ)==0)	
 									pchan->loc[0]= vecN[2];
+
+								/* auto-keyframing */
+								ED_autokeyframe_pchan(C, scene, ob, pchan, ks);
 							}
 							/* if the bone has a parent and is connected to the parent, 
 							 * don't do anything - will break chain unless we do auto-ik. 
@@ -582,8 +587,6 @@ static int snap_sel_to_grid(bContext *C, wmOperator *UNUSED(op))
 				}
 				ob->pose->flag |= (POSE_LOCKED|POSE_DO_UNLOCK);
 				
-				/* auto-keyframing */
-// XXX				autokeyframe_pose_cb_func(ob, TFM_TRANSLATION, 0);
 				DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
 			}
 			else {
@@ -607,7 +610,7 @@ static int snap_sel_to_grid(bContext *C, wmOperator *UNUSED(op))
 					ob->loc[2]+= vec[2];
 				
 				/* auto-keyframing */
-// XXX				autokeyframe_ob_cb_func(ob, TFM_TRANSLATION);
+				ED_autokeyframe_object(C, scene, ob, ks);
 			}
 		}
 		CTX_DATA_END;
@@ -673,6 +676,8 @@ static int snap_sel_to_curs(bContext *C, wmOperator *UNUSED(op))
 		
 	}
 	else {
+		struct KeyingSet *ks = ANIM_get_keyingset_for_autokeying(scene, "Location");
+
 		CTX_DATA_BEGIN(C, Object*, ob, selected_editable_objects) {
 			if(ob->mode & OB_MODE_POSE) {
 				bPoseChannel *pchan;
@@ -699,6 +704,9 @@ static int snap_sel_to_curs(bContext *C, wmOperator *UNUSED(op))
 									pchan->loc[1]= curspn[1];
 								if ((pchan->protectflag & OB_LOCK_LOCZ)==0)	
 									pchan->loc[2]= curspn[2];
+
+								/* auto-keyframing */
+								ED_autokeyframe_pchan(C, scene, ob, pchan, ks);
 							}
 							/* if the bone has a parent and is connected to the parent, 
 							 * don't do anything - will break chain unless we do auto-ik. 
@@ -708,8 +716,6 @@ static int snap_sel_to_curs(bContext *C, wmOperator *UNUSED(op))
 				}
 				ob->pose->flag |= (POSE_LOCKED|POSE_DO_UNLOCK);
 				
-				/* auto-keyframing */
-// XXX				autokeyframe_pose_cb_func(ob, TFM_TRANSLATION, 0);
 				DAG_id_tag_update(&ob->id, OB_RECALC_DATA);
 			}
 			else {
@@ -731,9 +737,9 @@ static int snap_sel_to_curs(bContext *C, wmOperator *UNUSED(op))
 					ob->loc[1]+= vec[1];
 				if ((ob->protectflag & OB_LOCK_LOCZ)==0)
 					ob->loc[2]+= vec[2];
-				
+
 				/* auto-keyframing */
-// XXX				autokeyframe_ob_cb_func(ob, TFM_TRANSLATION);
+				ED_autokeyframe_object(C, scene, ob, ks);
 			}
 		}
 		CTX_DATA_END;