bartvdbraak/blender
1
0
Fork 4
Code Issues 4 Pull Requests 1 Actions 1 Packages Projects Releases Wiki Activity

active metaball stiffness was not being limited to 10.0 as a maximum in the 3d properties panel (10000 instead).

Browse Source 
added radius, and type menu to the 3d properties panel.
This commit is contained in:
Campbell Barton 2006-09-16 04:26:22 +00:00
parent b71a05227a
commit 9932322fa8
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/blender/src/drawview.c
View File

@ -1932,15 +1932,21 @@ static void v3d_editmetaball_buts(uiBlock *block, Object *ob, float lim)
uiBlockBeginAlign(block); uiBlockBeginAlign(block);
if(lastelem->type!=MB_BALL) if(lastelem->type!=MB_BALL)
uiDefButF(block, NUM, B_RECALCMBALL, "dx:", 160, 70, 140, 19, &lastelem->expx, 0, lim, 100, 3, ""); uiDefButF(block, NUM, B_RECALCMBALL, "dx:", 160, 70, 140, 19, &lastelem->expx, 0, lim, 100, 3, "");
if((lastelem->type!=MB_BALL) && (lastelem->type!=MB_TUBE)) if((lastelem->type!=MB_BALL) && (lastelem->type!=MB_TUBE))
uiDefButF(block, NUM, B_RECALCMBALL, "dy:", 160, 50, 140, 19, &lastelem->expy, 0, lim, 100, 3, ""); uiDefButF(block, NUM, B_RECALCMBALL, "dy:", 160, 50, 140, 19, &lastelem->expy, 0, lim, 100, 3, "");
if((lastelem->type==MB_ELIPSOID) || (lastelem->type==MB_CUBE)) if((lastelem->type==MB_ELIPSOID) || (lastelem->type==MB_CUBE))
uiDefButF(block, NUM, B_RECALCMBALL, "dz:", 160, 30, 140, 19, &lastelem->expz, 0, lim, 100, 3, ""); uiDefButF(block, NUM, B_RECALCMBALL, "dz:", 160, 30, 140, 19, &lastelem->expz, 0, lim, 100, 3, "");
uiBlockEndAlign(block);
uiBlockBeginAlign(block);
uiDefButF(block, NUM, B_RECALCMBALL, "Radius:", 10, 120, 140, 19, &lastelem->rad, 0, lim, 100, 3, "Size of the active metaball");
uiDefButF(block, NUM, B_RECALCMBALL, "Stiffness:", 10, 100, 140, 19, &lastelem->s, 0, 10, 100, 3, "Stiffness of the active metaball");
uiBlockEndAlign(block); uiBlockEndAlign(block);
uiDefButF(block, NUM, B_RECALCMBALL, "Stiffness:", 10, 100, 140, 19, &lastelem->s, 0, lim, 100, 3, ""); uiDefButS(block, MENU, B_RECALCMBALL, "Type%t|Ball%x0|Tube%x4|Plane%x5|Elipsoid%x6|Cube%x7", 160, 120, 140, 19, &lastelem->type, 0.0, 0.0, 0, 0, "Set active element type");
} }
} }