diff options
author | Daniel Dunbar <daniel@zuster.org> | 2005-08-03 23:27:19 +0400 |
---|---|---|
committer | Daniel Dunbar <daniel@zuster.org> | 2005-08-03 23:27:19 +0400 |
commit | 1db88bd065f9638f235c2a1047b50255de7e05ac (patch) | |
tree | a6060158dbd3dafa2bee6207c19aec495a65af32 /source/blender/src | |
parent | 45386aeb3ce87a92cdd577307ed9301c65849664 (diff) |
- modify CCG to not crash when passed invalid faces, just ignores
that face... this situation should still not happen with well
written modifiers but at least it won't crash now
- bug fix in mirror modifier, calculation during editmode did not
check to make sure built mface's had valid indices... grr the
==0 tagging system is really a pain.
- convert a few uiDefBut calls to use explicit type
Diffstat (limited to 'source/blender/src')
-rw-r--r-- | source/blender/src/drawnla.c | 16 | ||||
-rw-r--r-- | source/blender/src/space.c | 8 |
2 files changed, 12 insertions, 12 deletions
diff --git a/source/blender/src/drawnla.c b/source/blender/src/drawnla.c index 1b6718a2b51..0fd3aed4229 100644 --- a/source/blender/src/drawnla.c +++ b/source/blender/src/drawnla.c @@ -486,20 +486,20 @@ static void nla_panel_properties(short cntrl) // NLA_HANDLER_PROPERTIES uiDefBut(block, LABEL, 0, "Options:", 10,60,300,19, 0, 0, 0, 0, 0, ""); uiBlockBeginAlign(block); - uiDefBut(block, NUM|FLO, B_REDR, "Strip Start:", 10,160,150,19, &strip->start, 1.0, MAXFRAMEF, 100, 0, "First frame in the timeline"); - uiDefBut(block, NUM|FLO, B_REDR, "Strip End:", 160,160,150,19, &strip->end, 1.0, MAXFRAMEF, 100, 0, "Last frame in the timeline"); + uiDefButF(block, NUM, B_REDR, "Strip Start:", 10,160,150,19, &strip->start, 1.0, MAXFRAMEF, 100, 0, "First frame in the timeline"); + uiDefButF(block, NUM, B_REDR, "Strip End:", 160,160,150,19, &strip->end, 1.0, MAXFRAMEF, 100, 0, "Last frame in the timeline"); uiBlockBeginAlign(block); - uiDefBut(block, NUM|FLO, B_REDR, "Action Start:", 10,120,150,19, &strip->actstart, 1.0, MAXFRAMEF, 100, 0, "First frame of the action to map to the playrange"); - uiDefBut(block, NUM|FLO, B_REDR, "Action End:", 160,120,150,19, &strip->actend, 1.0, MAXFRAMEF, 100, 0, "Last frame of the action to map to the playrange"); + uiDefButF(block, NUM, B_REDR, "Action Start:", 10,120,150,19, &strip->actstart, 1.0, MAXFRAMEF, 100, 0, "First frame of the action to map to the playrange"); + uiDefButF(block, NUM, B_REDR, "Action End:", 160,120,150,19, &strip->actend, 1.0, MAXFRAMEF, 100, 0, "Last frame of the action to map to the playrange"); uiBlockBeginAlign(block); - uiDefBut(block, NUM|FLO, B_REDR, "Blendin:", 10,80,150,19, &strip->blendin, 0.0, MAXFRAMEF, 100, 0, "Number of frames of ease-in"); - uiDefBut(block, NUM|FLO, B_REDR, "Blendout:", 160,80,150,19, &strip->blendout, 0.0, MAXFRAMEF, 100, 0, "Number of frames of ease-out"); + uiDefButF(block, NUM, B_REDR, "Blendin:", 10,80,150,19, &strip->blendin, 0.0, MAXFRAMEF, 100, 0, "Number of frames of ease-in"); + uiDefButF(block, NUM, B_REDR, "Blendout:", 160,80,150,19, &strip->blendout, 0.0, MAXFRAMEF, 100, 0, "Number of frames of ease-out"); uiBlockBeginAlign(block); - uiDefBut(block, NUM|FLO, B_REDR, "Repeat:", 10,40,150,19, &strip->repeat, 0.0001, MAXFRAMEF, 100, 0, "Number of times the action should repeat"); - 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"); + uiDefButF(block, NUM, B_REDR, "Repeat:", 10,40,150,19, &strip->repeat, 0.0001, MAXFRAMEF, 100, 0, "Number of times the action should repeat"); + uiDefButF(block, NUM, 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); 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"); diff --git a/source/blender/src/space.c b/source/blender/src/space.c index 9a5f7eb47e5..0757a1c1a73 100644 --- a/source/blender/src/space.c +++ b/source/blender/src/space.c @@ -2664,12 +2664,12 @@ void drawinfospace(ScrArea *sa, void *spacedata) (xpos+edgsp+mpref+midsp),y2,mpref,buth, &U.fontsize, 0, 0, 0, 0, "Restores to using the default included antialised font"); - uiDefButI(block, MENU|INT, B_SETFONTSIZE, fontsize_pup(), + uiDefButI(block, MENU, B_SETFONTSIZE, fontsize_pup(), (xpos+edgsp+mpref+midsp),y1,mpref,buth, &U.fontsize, 0, 0, 0, 0, "Current interface font size (points)"); /* - uiDefButS(block, MENU|SHO, B_SETENCODING, encoding_pup(), + uiDefButS(block, MENU, B_SETENCODING, encoding_pup(), (xpos+edgsp+mpref+midsp),y1,mpref,buth, &U.encoding, 0, 0, 0, 0, "Current interface font encoding"); @@ -2691,7 +2691,7 @@ void drawinfospace(ScrArea *sa, void *spacedata) (xpos+edgsp+(2.2*mpref)+(5*midsp)+(2*spref)),y1,spref,buth, &(U.transopts), 0, 0, 0, 0, "Translate toolbox menu"); - uiDefButI(block, MENU|SHO, B_SETLANGUAGE, language_pup(), + uiDefButI(block, MENU, B_SETLANGUAGE, language_pup(), (xpos+edgsp+(2.2*mpref)+(3*midsp)),y2,mpref+(0.5*mpref)+3,buth, &U.language, 0, 0, 0, 0, "Select interface language"); @@ -2791,7 +2791,7 @@ void drawinfospace(ScrArea *sa, void *spacedata) (xpos+edgsp),y2,lpref,buth, &(U.uiflag), 0, 0, 0, 0, "Display a list of input events in the console"); - uiDefButS(block, MENU|SHO, B_CONSOLEOUT, consolemethod_pup(), + uiDefButS(block, MENU, B_CONSOLEOUT, consolemethod_pup(), (xpos+edgsp), y1, lpref,buth, &U.console_out, 0, 0, 0, 0, "Select console output method"); |