Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Poirier <theeth@yahoo.com>2004-04-11 04:23:06 +0400
committerMartin Poirier <theeth@yahoo.com>2004-04-11 04:23:06 +0400
commit1039d15f5787c450af13146ca85e5ed1696b9cda (patch)
tree2f602446d2628db2743745a87266f450a9d185cb /source/blender/src/toolbox.c
parentb9659a072a9596749ac84ff326a04c48972f53d5 (diff)
Fix for bug #1145 bevel numbutton not changing when clicking on the sides
http://projects.blender.org/tracker/index.php?func=detail&aid=1145&group_id=9&atid=125 I changed the fbutton function to give the possibility to control the a1 and a2 parameters of the button. This commit also fixes two things in the bevel function: - The numbut didn't do anything because it wasn't recalculating the proper variable - The display wasn't recalculated when pressing Ctrl or Shift (it's now done by recalculating after every keyboard event. I've done it this way since the event loops seems to skip CTRL and SHIFT events)
Diffstat (limited to 'source/blender/src/toolbox.c')
-rw-r--r--source/blender/src/toolbox.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/src/toolbox.c b/source/blender/src/toolbox.c
index 6981469d4d2..1bccd979d3d 100644
--- a/source/blender/src/toolbox.c
+++ b/source/blender/src/toolbox.c
@@ -1169,7 +1169,7 @@ short sbutton(char *var, float min, float max, char *str)
return 0;
}
-short fbutton(float *var, float min, float max, char *str)
+short fbutton(float *var, float min, float max, float a1, float a2, char *str)
{
uiBlock *block;
ListBase listb={0, 0};
@@ -1191,7 +1191,7 @@ short fbutton(float *var, float min, float max, char *str)
x1=mval[0]-150;
y1=mval[1]-20;
- uiDefButF(block, NUM, 0, str,(short)(x1+5),(short)(y1+10),125,20, var, min, max, 0, 0, "");
+ uiDefButF(block, NUM, 0, str,(short)(x1+5),(short)(y1+10),125,20, var, min, max, a1, a2, "");
uiDefBut(block, BUT, 1, "OK",(short)(x1+136),(short)(y1+10), 35, 20, NULL, 0, 0, 0, 0, "");
uiBoundsBlock(block, 2);