[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13110] trunk/blender/source/blender/src: A few PoseLib and Action-Editor tweaks:
Joshua Leung
aligorith at gmail.com
Thu Jan 3 12:03:03 CET 2008
Revision: 13110
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13110
Author: aligorith
Date: 2008-01-03 12:03:03 +0100 (Thu, 03 Jan 2008)
Log Message:
-----------
A few PoseLib and Action-Editor tweaks:
* Removed "snap" from the names of the entries in the "Auto-Snap" menu for the Action Editor. "No Snap" is still "No Snap" though.
* PoseLib is now referred to as "Pose Library" in the interface
* Tidied up whitespace in editaction.c
Modified Paths:
--------------
trunk/blender/source/blender/src/buttons_editing.c
trunk/blender/source/blender/src/editaction.c
trunk/blender/source/blender/src/header_action.c
trunk/blender/source/blender/src/header_view3d.c
Modified: trunk/blender/source/blender/src/buttons_editing.c
===================================================================
--- trunk/blender/source/blender/src/buttons_editing.c 2008-01-03 10:27:29 UTC (rev 13109)
+++ trunk/blender/source/blender/src/buttons_editing.c 2008-01-03 11:03:03 UTC (rev 13110)
@@ -5068,7 +5068,7 @@
xco= 143;
- uiDefBut(block, LABEL,0, "Action (PoseLib):", xco, 154, 130,20, 0, 0, 0, 0, 0, "");
+ uiDefBut(block, LABEL,0, "Pose Library (Action):", xco, 154, 200, 20, 0, 0, 0, 0, 0, "");
/* PoseLib Action */
uiBlockSetCol(block, TH_BUT_SETTING2);
@@ -5085,12 +5085,12 @@
uiBlockBeginAlign(block);
/* currently 'active' pose */
- uiDefButI(block, MENU, B_POSELIB_APPLYP, menustr, xco, 85,18,20, &act->active_marker, 1, count, 0, 0, "Browses Poses in PoseLib. Applies chosen pose.");
+ uiDefButI(block, MENU, B_POSELIB_APPLYP, menustr, xco, 85,18,20, &act->active_marker, 1, count, 0, 0, "Browses Poses in Pose Library. Applies chosen pose.");
MEM_freeN(menustr);
if (act->active_marker) {
- uiDefBut(block, TEX, REDRAWBUTSEDIT,"", xco+18,85,160-18-20,20, marker->name, 0, 63, 0, 0, "Displays current PoseLib Pose name. Click to change.");
- uiDefIconBut(block, BUT, B_POSELIB_REMOVEP, VICON_X, xco+160-20, 85, 20, 20, NULL, 0.0, 0.0, 0.0, 0.0, "Remove this PoseLib Pose from PoseLib");
+ uiDefBut(block, TEX, REDRAWBUTSEDIT,"", xco+18,85,160-18-20,20, marker->name, 0, 63, 0, 0, "Displays current Pose Library Pose name. Click to change.");
+ uiDefIconBut(block, BUT, B_POSELIB_REMOVEP, VICON_X, xco+160-20, 85, 20, 20, NULL, 0.0, 0.0, 0.0, 0.0, "Remove this Pose Library Pose from Pose Library.");
}
/* add new poses */
Modified: trunk/blender/source/blender/src/editaction.c
===================================================================
--- trunk/blender/source/blender/src/editaction.c 2008-01-03 10:27:29 UTC (rev 13109)
+++ trunk/blender/source/blender/src/editaction.c 2008-01-03 11:03:03 UTC (rev 13110)
@@ -2943,10 +2943,10 @@
case AKEY:
if (mval[0]<NAMEWIDTH) {
deselect_action_channels (1);
- allqueue (REDRAWVIEW3D, 0);
- allqueue (REDRAWACTION, 0);
+ allqueue(REDRAWVIEW3D, 0);
+ allqueue(REDRAWACTION, 0);
allqueue(REDRAWNLA, 0);
- allqueue (REDRAWIPO, 0);
+ allqueue(REDRAWIPO, 0);
}
else if (mval[0]>ACTWIDTH) {
if (G.qual == LR_CTRLKEY) {
@@ -2959,9 +2959,9 @@
}
else {
deselect_action_keys (1, 1);
- allqueue (REDRAWACTION, 0);
+ allqueue(REDRAWACTION, 0);
allqueue(REDRAWNLA, 0);
- allqueue (REDRAWIPO, 0);
+ allqueue(REDRAWIPO, 0);
}
}
break;
@@ -3067,7 +3067,7 @@
break;
case NKEY:
- if(G.qual==0) {
+ if (G.qual==0) {
numbuts_action();
/* no panel (yet). current numbuts are not easy to put in panel... */
@@ -3272,8 +3272,7 @@
}
}
- if(doredraw) addqueue(curarea->win, REDRAW, 1);
-
+ if (doredraw) addqueue(curarea->win, REDRAW, 1);
}
/* **************************************************** */
Modified: trunk/blender/source/blender/src/header_action.c
===================================================================
--- trunk/blender/source/blender/src/header_action.c 2008-01-03 10:27:29 UTC (rev 13109)
+++ trunk/blender/source/blender/src/header_action.c 2008-01-03 11:03:03 UTC (rev 13110)
@@ -1280,13 +1280,13 @@
/* draw AUTOSNAP */
if (G.saction->flag & SACTION_DRAWTIME) {
uiDefButS(block, MENU, B_REDR,
- "Auto-Snap Keyframes %t|No Snap %x0|Second Step Snap %x1|Nearest Second Snap %x2|Nearest Marker Snap%x3",
+ "Auto-Snap Keyframes %t|No Snap %x0|Second Step %x1|Nearest Second %x2|Nearest Marker %x3",
xco,0,70,YIC, &(G.saction->autosnap), 0, 1, 0, 0,
"Auto-snapping mode for keyframes when transforming");
}
else {
uiDefButS(block, MENU, B_REDR,
- "Auto-Snap Keyframes %t|No Snap %x0|Frame Step Snap %x1|Nearest Frame Snap %x2|Nearest Marker Snap %x3",
+ "Auto-Snap Keyframes %t|No Snap %x0|Frame Step %x1|Nearest Frame %x2|Nearest Marker %x3",
xco,0,70,YIC, &(G.saction->autosnap), 0, 1, 0, 0,
"Auto-snapping mode for keyframes when transforming");
}
Modified: trunk/blender/source/blender/src/header_view3d.c
===================================================================
--- trunk/blender/source/blender/src/header_view3d.c 2008-01-03 10:27:29 UTC (rev 13109)
+++ trunk/blender/source/blender/src/header_view3d.c 2008-01-03 11:03:03 UTC (rev 13110)
@@ -4083,7 +4083,7 @@
block= uiNewBlock(&curarea->uiblocks, "view3d_pose_armature_poselibmenu", UI_EMBOSSP, UI_HELV, G.curscreen->mainwin);
uiBlockSetButmFunc(block, do_view3d_pose_armature_poselibmenu, NULL);
- uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Apply Pose|Ctrl L", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
+ uiDefIconTextBut(block, BUTM, 1, ICON_BLANK1, "Browse Poses|Ctrl L", 0, yco-=20, menuwidth, 19, NULL, 0.0, 0.0, 1, 1, "");
uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
@@ -4174,7 +4174,7 @@
uiDefBut(block, SEPR, 0, "", 0, yco-=6, menuwidth, 6, NULL, 0.0, 0.0, 0, 0, "");
- uiDefIconTextBlockBut(block, view3d_pose_armature_poselibmenu, NULL, ICON_RIGHTARROW_THIN, "PoseLib", 0, yco-=20, 120, 19, "");
+ uiDefIconTextBlockBut(block, view3d_pose_armature_poselibmenu, NULL, ICON_RIGHTARROW_THIN, "Pose Library", 0, yco-=20, 120, 19, "");
uiDefIconTextBlockBut(block, view3d_pose_armature_motionpathsmenu, NULL, ICON_RIGHTARROW_THIN, "Motion Paths", 0, yco-=20, 120, 19, "");
uiDefIconTextBlockBut(block, view3d_pose_armature_ikmenu, NULL, ICON_RIGHTARROW_THIN, "Inverse Kinematics", 0, yco-=20, 120, 19, "");
uiDefIconTextBlockBut(block, view3d_pose_armature_constraintsmenu, NULL, ICON_RIGHTARROW_THIN, "Constraints", 0, yco-=20, 120, 19, "");
More information about the Bf-blender-cvs
mailing list