Revision: 15354
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15354
Author: campbellbarton
Date: 2008-06-25 18:15:57 +0200 (Wed, 25 Jun 2008)
Log Message:
-----------
int toggle button function was being used on a short, remove warnings in
buttons_logic.c too
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 2008-06-25 16:09:29 UTC
(rev 15353)
+++ trunk/blender/source/blender/src/buttons_logic.c 2008-06-25 16:15:57 UTC
(rev 15354)
@@ -1602,7 +1602,7 @@
float *fp;
short ysize = 0, wval;
- char *str, name[32];
+ char *str;
int myline, stbit;
/* yco is at the top of the rect, draw downwards */
@@ -1653,16 +1653,16 @@
uiDefBut(block, LABEL, 0, "damp", xco, yco-148,
45, 19, NULL, 0, 0, 0, 0, "Number of frames to reach the target velocity");
uiDefButI(block, NUM, 0, "", xco+45,
yco-148, wval, 19, &oa->damping, 0.0, 1000.0, 100, 0, "");
- uiDefButBitI(block, TOG, ACT_CLAMP_VEL, 0,
"clamp",xco+45+wval, yco-148, wval, 19, &oa->flag, 0.0, 0.0, 0, 0, "Toggles
between SET and CLAMP Velocity");
+ uiDefButBitS(block, TOG, ACT_CLAMP_VEL, 0,
"clamp",xco+45+wval, yco-148, wval, 19, &oa->flag, 0.0, 0.0, 0, 0, "Toggles
between SET and CLAMP Velocity");
- uiDefButBitI(block, TOG, ACT_FORCE_LOCAL, 0, "L",
xco+45+3*wval, yco-22, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local
transformation");
- uiDefButBitI(block, TOG, ACT_TORQUE_LOCAL, 0, "L",
xco+45+3*wval, yco-41, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local
transformation");
- uiDefButBitI(block, TOG, ACT_DLOC_LOCAL, 0, "L",
xco+45+3*wval, yco-64, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local
transformation");
- uiDefButBitI(block, TOG, ACT_DROT_LOCAL, 0, "L",
xco+45+3*wval, yco-83, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local
transformation");
- uiDefButBitI(block, TOG, ACT_LIN_VEL_LOCAL, 0, "L",
xco+45+3*wval, yco-106, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local
transformation");
- uiDefButBitI(block, TOG, ACT_ANG_VEL_LOCAL, 0, "L",
xco+45+3*wval, yco-125, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local
transformation");
+ uiDefButBitS(block, TOG, ACT_FORCE_LOCAL, 0, "L",
xco+45+3*wval, yco-22, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local
transformation");
+ uiDefButBitS(block, TOG, ACT_TORQUE_LOCAL, 0, "L",
xco+45+3*wval, yco-41, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local
transformation");
+ uiDefButBitS(block, TOG, ACT_DLOC_LOCAL, 0, "L",
xco+45+3*wval, yco-64, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local
transformation");
+ uiDefButBitS(block, TOG, ACT_DROT_LOCAL, 0, "L",
xco+45+3*wval, yco-83, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local
transformation");
+ uiDefButBitS(block, TOG, ACT_LIN_VEL_LOCAL, 0, "L",
xco+45+3*wval, yco-106, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local
transformation");
+ uiDefButBitS(block, TOG, ACT_ANG_VEL_LOCAL, 0, "L",
xco+45+3*wval, yco-125, 15, 19, &oa->flag, 0.0, 0.0, 0, 0, "Local
transformation");
- uiDefButBitI(block, TOG, ACT_ADD_LIN_VEL, 0,
"add",xco+45+3*wval+15, yco-106, 35, 19, &oa->flag, 0.0, 0.0, 0, 0, "Toggles
between ADD and SET linV");
+ uiDefButBitS(block, TOG, ACT_ADD_LIN_VEL, 0,
"add",xco+45+3*wval+15, yco-106, 35, 19, &oa->flag, 0.0, 0.0, 0, 0, "Toggles
between ADD and SET linV");
yco-= ysize;
break;
@@ -2789,7 +2789,6 @@
uiBlock *block;
uiBut *but;
bController *cont = arg_cont;
- int mask;
short yco = 12, xco = 0, stbit, offset;
@@ -2839,7 +2838,6 @@
static uiBlock *object_state_mask_menu(void *arg_obj)
{
uiBlock *block;
- uiBut *but;
short xco = 0;
block= uiNewBlock(&curarea->uiblocks, "obstatemenu", UI_EMBOSSP,
UI_HELV, curarea->win);
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
