[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [16571] trunk/blender/source/blender/src: Delete Keyframe Tool:

[Joshua Leung]

Revision: 16571
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16571
Author:   aligorith
Date:     2008-09-17 06:06:59 +0200 (Wed, 17 Sep 2008)

Log Message:
-----------
Delete Keyframe Tool:

* Changed hotkey to Alt-I. As a result, Remove IK is now Ctrl-Alt-I, though that shouldn't affect many people at all as it appears that hardly anyone uses it.

* Added menu entries for Delete Keyframe

Modified Paths:
--------------
    trunk/blender/source/blender/src/header_view3d.c
    trunk/blender/source/blender/src/space.c
    trunk/blender/source/blender/src/toets.c

Modified: trunk/blender/source/blender/src/header_view3d.c
===================================================================
--- trunk/blender/source/blender/src/header_view3d.c	2008-09-17 03:13:15 UTC (rev 16570)
+++ trunk/blender/source/blender/src/header_view3d.c	2008-09-17 04:06:59 UTC (rev 16571)
@@ -2523,6 +2523,9 @@
 		if(session) b_verse_push_object(session, ob);
 		break;
 #endif
+	case 18: /* delete keyframe */
+		common_deletekey();
+		break; 
 	}
 	allqueue(REDRAWVIEW3D, 0);
 }
@@ -2559,6 +2562,7 @@
 	uiDefBut(block, SEPR, 0, "",				0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 	
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Insert Keyframe|I",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 11, "");	
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Delete Keyframe|Alt I",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 18, "");	
 	
 	uiDefBut(block, SEPR, 0, "",				0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 	
@@ -3151,6 +3155,9 @@
 	case 15:
 		uv_autocalc_tface();
 		break;
+	case 16: /* delete keyframe */
+		common_deletekey();
+		break;
 	}
 	allqueue(REDRAWVIEW3D, 0);
 }
@@ -3186,6 +3193,7 @@
 	uiDefBut(block, SEPR, 0, "",				0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 	
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Insert Keyframe|I",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Delete Keyframe|Alt I",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 16, "");
 	
 	uiDefBut(block, SEPR, 0, "",				0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 	
@@ -3417,6 +3425,9 @@
 	case 15:
 		uv_autocalc_tface();
 		break;
+	case 16: /* delete keyframe */
+		common_deletekey();
+		break;
 	}
 	allqueue(REDRAWVIEW3D, 0);
 }
@@ -3441,6 +3452,7 @@
 	uiDefBut(block, SEPR, 0, "",				0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 	
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Insert Keyframe|I",				0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Delete Keyframe|Alt I",				0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 16, "");
 	
 	uiDefBut(block, SEPR, 0, "",				0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 	
@@ -3761,6 +3773,9 @@
 	case 6:
 		uv_autocalc_tface();
 		break;
+	case 7: /* delete keyframe */
+		common_deletekey();
+		break;
 	}
 	allqueue(REDRAWVIEW3D, 0);
 }
@@ -3784,6 +3799,7 @@
 	uiDefBut(block, SEPR, 0, "",				0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 	
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Insert Keyframe|I",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Delete Keyframe|Alt I",	0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 7, "");
 	
 	uiDefBut(block, SEPR, 0, "",				0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 	
@@ -4171,7 +4187,7 @@
 	uiBlockSetButmFunc(block, do_view3d_pose_armature_ikmenu, NULL);
 	
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Add IK to Bone...|Shift I",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Clear IK...|Alt I",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Clear IK...|Ctrl Alt I",			0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 2, "");
 	
 	uiBlockSetDirection(block, UI_RIGHT);
 	uiTextBoundsBlock(block, 60);
@@ -4374,6 +4390,9 @@
 	case 19: /* assign pose as restpose */
 		apply_armature_pose2bones();
 		break;
+	case 20: /* delete keyframe */
+		common_deletekey();
+		break;
 	}
 		
 	allqueue(REDRAWVIEW3D, 0);
@@ -4395,6 +4414,7 @@
 	uiDefBut(block, SEPR, 0, "",				0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 	
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Insert Keyframe|I",				0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 4, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Delete Keyframe|Alt I",				0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 20, "");
 	
 	uiDefBut(block, SEPR, 0, "",				0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 

Modified: trunk/blender/source/blender/src/space.c
===================================================================
--- trunk/blender/source/blender/src/space.c	2008-09-17 03:13:15 UTC (rev 16570)
+++ trunk/blender/source/blender/src/space.c	2008-09-17 04:06:59 UTC (rev 16571)
@@ -2218,7 +2218,7 @@
 					else
 						selectswap();
 				}
-				else if(G.qual==LR_ALTKEY) {
+				else if(G.qual==(LR_CTRLKEY|LR_ALTKEY)) {
 					if(ob && (ob->flag & OB_POSEMODE) && ob->type==OB_ARMATURE)
 						pose_clear_IK();
 				}

Modified: trunk/blender/source/blender/src/toets.c
===================================================================
--- trunk/blender/source/blender/src/toets.c	2008-09-17 03:13:15 UTC (rev 16570)
+++ trunk/blender/source/blender/src/toets.c	2008-09-17 04:06:59 UTC (rev 16571)
@@ -793,7 +793,7 @@
 			ob= OBACT;
 
 			if(G.f & G_SCULPTMODE) return 1;
-			else if(G.qual==(LR_CTRLKEY|LR_ALTKEY)) {
+			else if(G.qual==LR_ALTKEY) {
 				common_deletekey();
 				return 0;
 			}