[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [12176] trunk/blender/source/blender/src: == IPO Editor Transform ==

[Joshua Leung]

Revision: 12176
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=12176
Author:   aligorith
Date:     2007-10-01 09:10:50 +0200 (Mon, 01 Oct 2007)

Log Message:
-----------
== IPO Editor Transform ==

* It is now possible to rotate the Bezier controls for the IPO Editor (RKEY)
* IPO Record has now been remapped to Ctrl R.

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

Modified: trunk/blender/source/blender/src/header_ipo.c
===================================================================
--- trunk/blender/source/blender/src/header_ipo.c	2007-10-01 03:11:11 UTC (rev 12175)
+++ trunk/blender/source/blender/src/header_ipo.c	2007-10-01 07:10:50 UTC (rev 12176)
@@ -262,7 +262,10 @@
 	case 0: /* grab/move */
 		transform_ipo('g');
 		break;
-	case 1: /* scale */
+	case 1: /* rotate */
+		transform_ipo('r');
+		break;
+	case 2: /* scale */
 		transform_ipo('s');
 		break;
 	}
@@ -277,7 +280,8 @@
 	uiBlockSetButmFunc(block, do_ipo_editmenu_transformmenu, NULL);
 
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Grab/Move|G", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 0, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Scale|S", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 1, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Rotate|R", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 1, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Scale|S", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 2, "");
 
 	uiBlockSetDirection(block, UI_RIGHT);
 	uiTextBoundsBlock(block, 60);
@@ -639,7 +643,7 @@
 	uiDefBut(block, SEPR, 0, "",        0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
 
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Duplicate|Shift D", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 1, "");
-	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Record Mouse Movement|R", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 2, "");
+	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Record Mouse Movement|Ctrl R", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 2, "");
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Clean IPO Curves|O", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 8, "");
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Smooth IPO Curves|Shift O", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 9, "");
 	uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Delete|X", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 0, 0, "");

Modified: trunk/blender/source/blender/src/space.c
===================================================================
--- trunk/blender/source/blender/src/space.c	2007-10-01 03:11:11 UTC (rev 12175)
+++ trunk/blender/source/blender/src/space.c	2007-10-01 07:10:50 UTC (rev 12176)
@@ -2876,8 +2876,10 @@
 			allqueue(REDRAWIPO, 0);
 			break;
 		case RKEY:
-			if (G.qual==0)
+			if (G.qual==LR_CTRLKEY)
 				ipo_record();
+			else 
+				transform_ipo('r');
 			break;
 		case SKEY:
 			if (G.qual==LR_SHIFTKEY) {