Revision: 20384
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20384
Author: dfelinto
Date: 2009-05-24 21:21:54 +0200 (Sun, 24 May 2009)
Log Message:
-----------
Action actuator default value changed from 0.0 to 1.0. Bookmark renamed to Mark
and other small logic tooltip changes
- IPOs and actions start it's frame counting in frame 1, not zero.
- Talked with Ben and we agreed to rename the "bookmark" feature before an
official release.
- some English typos.
- removed all period in the end of tooltips for consistency's sake.
* note:
I resisted one more time to the temptation of alphabetical ordering the Sensors
and Actuators.
That will be the first thing I would like to do after we are done with 2.49 :)
It really annoys me as a user.
Modified Paths:
--------------
trunk/blender/source/blender/src/buttons_logic.c
Modified: trunk/blender/source/blender/src/buttons_logic.c
===================================================================
--- trunk/blender/source/blender/src/buttons_logic.c 2009-05-24 16:22:09 UTC
(rev 20383)
+++ trunk/blender/source/blender/src/buttons_logic.c 2009-05-24 19:21:54 UTC
(rev 20384)
@@ -1155,11 +1155,11 @@
uiDefButBitS(block, TOG, SENS_COLLISION_PULSE, B_REDR,
"Pulse",(short)(xco + 10),(short)(yco - 44),
(short)(0.20 * (width-20)), 19, &cs->mode, 0.0,
0.0, 0, 0,
- "Changes to the set of colliding objects
generate pulses");
+ "Changes to the set of colliding objects
generated pulses");
uiDefButBitS(block, TOG, SENS_COLLISION_MATERIAL,
B_REDR, "M/P",(short)(xco + 10 + (0.20 * (width-20))),(short)(yco - 44),
(short)(0.20 * (width-20)), 19, &cs->mode, 0.0,
0.0, 0, 0,
- "Toggle collision on material or property.");
+ "Toggle collision on material or property");
if (cs->mode & SENS_COLLISION_MATERIAL) {
uiDefBut(block, TEX, 1, "Material:",
(short)(xco + 10 + 0.40 * (width-20)),
@@ -1215,12 +1215,12 @@
uiDefButS(block, MENU, B_REDR, str,
(short)(10+xco+0.7 * (width-20)),
(short)(yco-44), (short)(0.3 * (width-22)), 19,
&rs->axis, 2.0, 31, 0, 0,
- "Specify along which axis the radar cone is
cast.");
+ "Specify along which axis the radar cone is
cast");
uiDefButF(block, NUM, 1, "Ang:",
(short)(10+xco), (short)(yco-68),
(short)((width-20)/2), 19,
&rs->angle, 0.0, 179.9, 10, 0,
- "Opening angle of the radar cone.");
+ "Opening angle of the radar cone");
uiDefButF(block, NUM, 1, "Dist:",
(short)(xco+10 + (width-20)/2),
(short)(yco-68), (short)((width-20)/2), 19,
&rs->range, 0.01, 10000.0, 100, 0,
@@ -1263,14 +1263,14 @@
xco+10, yco-((ks->type&1) ? 68:92), (width-20),
19,
ks->toggleName, 0, 31, 0, 0,
"Property that indicates whether to log "
- "keystrokes as a string.");
+ "keystrokes as a string");
/* line 5: target property for string logging mode */
uiDefBut(block, TEX, 1, "Target: ",
xco+10, yco-((ks->type&1) ? 92:116),
(width-20), 19,
ks->targetName, 0, 31, 0, 0,
"Property that receives the keystrokes in case "
- "a string is logged.");
+ "a string is logged");
yco-= ysize;
break;
@@ -1369,7 +1369,7 @@
"Right button %x4|Wheel Up %x5|Wheel Down
%x6|Movement %x8|Mouse over %x16|Mouse over any%x32";
uiDefButS(block, MENU, B_REDR, str, xco+10, yco-44,
width-20, 19,
&ms->type, 0, 31, 0, 0,
- "Specify the type of event this mouse sensor
should trigger on.");
+ "Specify the type of event this mouse sensor
should trigger on");
yco-= ysize;
break;
@@ -1406,7 +1406,7 @@
uiDefButBitS(block, TOG, SENS_COLLISION_MATERIAL,
B_REDR, "M/P",
xco + 10,yco - 44, 0.20 * (width-20), 19,
&raySens->mode, 0.0, 0.0, 0, 0,
- "Toggle collision on material or property.");
+ "Toggle collision on material or property");
if (raySens->mode & SENS_COLLISION_MATERIAL)
{
@@ -1435,7 +1435,7 @@
str = "Type %t|+ X axis %x1|+ Y axis %x0|+ Z axis %x2|-
X axis %x3|- Y axis %x4|- Z axis %x5";
uiDefButI(block, MENU, B_REDR, str, xco+10 + 0.6 *
(width-20), yco-68, 0.4 * (width-20), 19,
&raySens->axisflag, 2.0, 31, 0, 0,
- "Specify along which axis the ray is cast.");
+ "Specify along which axis the ray is cast");
yco-= ysize;
break;
@@ -1482,7 +1482,7 @@
str= "Type %t|Button %x0|Axis %x1|Single Axis
%x3|Hat%x2";
uiDefButC(block, MENU, B_REDR, str, xco+87, yco-44,
0.26 * (width-20), 19,
&joy->type, 0, 31, 0, 0,
- "The type of event this joystick sensor is
triggered on.");
+ "The type of event this joystick sensor is
triggered on");
if (joy->type != SENS_JOY_AXIS_SINGLE) {
if (joy->flag & SENS_JOY_ANY_EVENT) {
@@ -1518,7 +1518,7 @@
{
uiDefButS(block, NUM, 1, "Number:", xco+10,
yco-68, 0.46 * (width-20), 19,
&joy->axis, 1, 8.0, 100, 0,
- "Specify which axis pair to use, 1 is useually
the main direction input.");
+ "Specify which axis pair to use, 1 is useually
the main direction input");
uiDefButI(block, NUM, 1, "Threshold:", xco+10 +
0.6 * (width-20),yco-44, 0.4 * (width-20), 19,
&joy->precision, 0, 32768.0, 100, 0,
@@ -1606,8 +1606,8 @@
if(pc->mode==0)
uiDefIDPoinBut(block, test_scriptpoin_but, ID_SCRIPT,
1, "", xco+90,yco-24,width-90, 19, &pc->text, "Blender textblock to run as a
script");
else {
- uiDefBut(block, TEX, 1, "",
xco+90,yco-24,(width-90)-25, 19, pc->module, 0, 63, 0, 0, "Module name and
function to run eg \"someModule.main\", internal texts external python files
can be used");
- uiDefButBitI(block, TOG, CONT_PY_DEBUG, B_REDR, "D",
(xco+width)-25, yco-24, 19, 19, &pc->flag, 0, 0, 0, 0, "Continuously reload the
module from disk for editing external modules without restrting");
+ uiDefBut(block, TEX, 1, "",
xco+90,yco-24,(width-90)-25, 19, pc->module, 0, 63, 0, 0, "Module name and
function to run e.g. \"someModule.main\". Internal texts and external python
files can be used");
+ uiDefButBitI(block, TOG, CONT_PY_DEBUG, B_REDR, "D",
(xco+width)-25, yco-24, 19, 19, &pc->flag, 0, 0, 0, 0, "Continuously reload the
module from disk for editing external modules without restarting");
}
uiBlockEndAlign(block);
@@ -1837,13 +1837,13 @@
uiDefBut(block, LABEL, 0, "Ref", xco,
yco-45, 45, 19, NULL, 0, 0, 0, 0, "");
uiDefIDPoinBut(block, test_obpoin_but, ID_OB,
1, "OB:", xco+45, yco-45, wval*3, 19, &(oa->reference), "Reference
object for velocity calculation, leave empty for world reference");
- uiDefBut(block, LABEL, 0, "linV", xco,
yco-68, 45, 19, NULL, 0, 0, 0, 0, "Sets the target relative linear velocity, it
will be achieve by automatic application of force. Null velocity is a valid
target");
+ uiDefBut(block, LABEL, 0, "linV", xco,
yco-68, 45, 19, NULL, 0, 0, 0, 0, "Sets the target relative linear velocity, it
will be achieved by automatic application of force. Null velocity is a valid
target");
uiDefButF(block, NUM, 0, "", xco+45,
yco-68, wval, 19, oa->linearvelocity, -10000.0, 10000.0, 10, 0, "");
uiDefButF(block, NUM, 0, "",
xco+45+wval, yco-68, wval, 19, oa->linearvelocity+1, -10000.0, 10000.0, 10, 0,
"");
uiDefButF(block, NUM, 0, "",
xco+45+2*wval, yco-68, wval, 19, oa->linearvelocity+2, -10000.0, 10000.0, 10,
0, "");
uiDefButBitS(block, TOG, ACT_LIN_VEL_LOCAL, 0,
"L", xco+45+3*wval, yco-68, 15, 19, &oa->flag, 0.0, 0.0, 0, 0,
"Velocity is defined in local coordinates");
- uiDefBut(block, LABEL, 0, "Limit", xco,
yco-91, 45, 19, NULL, 0, 0, 0, 0, "Select if the force need to be limited along
certain axis (local or global depending on LinV Local flag)");
+ uiDefBut(block, LABEL, 0, "Limit", xco,
yco-91, 45, 19, NULL, 0, 0, 0, 0, "Select if the force needs to be limited
along certain axis (local or global depending on LinV Local flag)");
uiDefButBitS(block, TOG, ACT_SERVO_LIMIT_X,
B_REDR, "X", xco+45, yco-91, wval, 19, &oa->flag, 0.0, 0.0, 0,
0, "Set limit to force along the X axis");
uiDefButBitS(block, TOG, ACT_SERVO_LIMIT_Y,
B_REDR, "Y", xco+45+wval, yco-91, wval, 19, &oa->flag, 0.0, 0.0,
0, 0, "Set limit to force along the Y axis");
uiDefButBitS(block, TOG, ACT_SERVO_LIMIT_Z,
B_REDR, "Z", xco+45+2*wval, yco-91, wval, 19, &oa->flag, 0.0,
0.0, 0, 0, "Set limit to force along the Z axis");
@@ -1911,8 +1911,8 @@
}
else
{
- uiDefButI(block, NUM, 0, "Sta: ",xco+10,
yco-44, (width-20)/2, 19, &aa->sta, 0.0, MAXFRAMEF, 0, 0, "Start frame");
- uiDefButI(block, NUM, 0, "End:
",xco+10+(width-20)/2, yco-44, (width-20)/2, 19, &aa->end, 0.0, MAXFRAMEF, 0,
0, "End frame");
+ uiDefButI(block, NUM, 0, "Sta: ",xco+10,
yco-44, (width-20)/2, 19, &aa->sta, 1.0, MAXFRAMEF, 0, 0, "Start frame");
+ uiDefButI(block, NUM, 0, "End:
",xco+10+(width-20)/2, yco-44, (width-20)/2, 19, &aa->end, 1.0, MAXFRAMEF, 0,
0, "End frame");
}
uiDefButS(block, NUM, 0, "Blendin: ", xco+10, yco-64,
(width-20)/2, 19, &aa->blendin, 0.0, 32767, 0.0, 0.0, "Number of frames of
motion blending");
@@ -1963,7 +1963,7 @@
uiDefButBitS(block, TOG, ACT_IPOLOCAL, 0,
"L", xco+width-30, yco-24, 20, 19,
&ia->flag, 0, 0, 0, 0,
- "Let the ipo acts in local coordinates,
used in Force and Add mode.");
+ "Let the ipo acts in local coordinates,
used in Force and Add mode");
}
if(ia->type==ACT_IPO_FROM_PROP) {
@@ -1989,7 +1989,7 @@
uiDefBut(block, TEX, 0,
"FrameProp: ", xco+10, yco-64,
width-20, 19,
ia->frameProp, 0.0, 31.0, 0, 0,
- "Assign this property this action current frame
number");
+ "Assign the action's current frame number to
this property");
yco-= ysize;
break;
@@ -2133,16 +2133,16 @@
wval= (width-60)/3;
uiDefBut(block, LABEL, 0, "linV", xco,
yco-68, 45, 19,
NULL, 0, 0, 0, 0,
- "Velocity upon creation.");
+ "Velocity upon creation");
uiDefButF(block, NUM, 0, "", xco+45,
yco-68, wval, 19,
eoa->linVelocity, -100.0, 100.0, 10, 0,
- "Velocity upon creation, x
component.");
+ "Velocity upon creation, x component");
uiDefButF(block, NUM, 0, "", xco+45+wval,
yco-68, wval, 19,
eoa->linVelocity+1, -100.0, 100.0, 10,
0,
- "Velocity upon creation, y
component.");
+ "Velocity upon creation, y component");
uiDefButF(block, NUM, 0, "", xco+45+2*wval,
yco-68, wval, 19,
eoa->linVelocity+2, -100.0, 100.0, 10,
0,
- "Velocity upon creation, z
component.");
+ "Velocity upon creation, z component");
uiDefButBitS(block, TOG, ACT_EDOB_LOCAL_LINV, 0, "L",
xco+45+3*wval, yco-68, 15, 19,
&eoa->localflag, 0.0, 0.0, 0, 0,
"Apply the transformation locally");
@@ -2150,16 +2150,16 @@
uiDefBut(block, LABEL, 0, "AngV", xco,
yco-90, 45, 19,
NULL, 0, 0, 0, 0,
- "Angular velocity upon creation.");
+ "Angular velocity upon creation");
uiDefButF(block, NUM, 0, "", xco+45,
yco-90, wval, 19,
eoa->angVelocity, -10000.0, 10000.0,
10, 0,
- "Angular velocity upon creation, x
component.");
+ "Angular velocity upon creation, x
component");
uiDefButF(block, NUM, 0, "", xco+45+wval,
yco-90, wval, 19,
eoa->angVelocity+1, -10000.0, 10000.0,
10, 0,
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
