diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2005-08-03 22:48:22 +0400 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2005-08-03 22:48:22 +0400 |
| commit | b03a20d2721c938f0e65bf9a426fd44028c4592a (patch) | |
| tree | 21d5a1f1d1bb5924b6cceec5eb1e34c1afea491f /source/blender/src/drawnla.c | |
| parent | 2cc6d565cbc9da005e1c13828c6b3a3d46cd32cb (diff) | |
- got rid of silly #define ..._BIT, #define ... (1<<..._BIT) stuff
- switched almost all uiDefBut(..., TOG|BIT|..) to use UiDefButBit and the
name of the actual bit define instead of just a magic constant, this makes
searching the code much nicer. most of the credit here goes to LetterRip
who did almost all of the conversions, I mostly just checked them over.
Diffstat (limited to 'source/blender/src/drawnla.c')
| -rw-r--r-- | source/blender/src/drawnla.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/src/drawnla.c b/source/blender/src/drawnla.c index 72e74fd3ff6..1b6718a2b51 100644 --- a/source/blender/src/drawnla.c +++ b/source/blender/src/drawnla.c @@ -502,9 +502,9 @@ static void nla_panel_properties(short cntrl) // NLA_HANDLER_PROPERTIES uiDefBut(block, NUM|FLO, B_REDR, "Stride:", 160,40,150,19, &strip->stridelen, 0.0001, MAXFRAMEF, 100, 0, "Distance covered by one complete cycle of the action specified in the Action Range"); uiBlockBeginAlign(block); - uiDefBut(block, TOG|SHO|BIT|ACTSTRIP_USESTRIDEBIT, B_REDR, "Use Path", 10,0,100,19, &strip->flag, 0, 0, 0, 0, "Plays action based on path position & stride. Only armatures parented to a path"); - uiDefBut(block, TOG|SHO|BIT|ACTSTRIP_HOLDLASTFRAMEBIT, B_REDR, "Hold", 110,0,100,19, &strip->flag, 0, 0, 0, 0, "Toggles whether to continue displaying the last frame past the end of the strip"); - uiDefBut(block, TOG|SHO, B_REDR, "Add", 210,0,100,19, &strip->mode, 0, 0, 0, 0, "Toggles additive blending mode"); + uiDefButBitS(block, TOG, ACTSTRIP_USESTRIDE, B_REDR, "Use Path", 10,0,100,19, &strip->flag, 0, 0, 0, 0, "Plays action based on path position & stride. Only armatures parented to a path"); + uiDefButBitS(block, TOG, ACTSTRIP_HOLDLASTFRAME, B_REDR, "Hold", 110,0,100,19, &strip->flag, 0, 0, 0, 0, "Toggles whether to continue displaying the last frame past the end of the strip"); + uiDefButS(block, TOG, B_REDR, "Add", 210,0,100,19, &strip->mode, 0, 0, 0, 0, "Toggles additive blending mode"); } static void nla_blockhandlers(ScrArea *sa) |