diff options
| author | Nicholas Bishop <nicholasbishop@gmail.com> | 2008-08-14 04:42:54 +0400 |
|---|---|---|
| committer | Nicholas Bishop <nicholasbishop@gmail.com> | 2008-08-14 04:42:54 +0400 |
| commit | e3381f2203b09152108bf1075d4e7747c8e3ed8f (patch) | |
| tree | 1c40376e699ce69c4066d89098f10035fdea105d /source/blender/src | |
| parent | c10cfc94bf31d6991cd578d846aa52212c3a8a40 (diff) | |
Added back the choice between simple subdiv vs. catmull clark for multires.
Diffstat (limited to 'source/blender/src')
| -rw-r--r-- | source/blender/src/buttons_editing.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/src/buttons_editing.c b/source/blender/src/buttons_editing.c index 3cee42e97a9..7e757d4031b 100644 --- a/source/blender/src/buttons_editing.c +++ b/source/blender/src/buttons_editing.c @@ -1658,7 +1658,7 @@ static void multiresModifier_subdivide_button(void *mmd_v, void *ob_v) MultiresModifierData *mmd = mmd_v; if(mmd && ob_v) { - multiresModifier_subdivide(mmd, ob_v, 0); + multiresModifier_subdivide(mmd, ob_v, 0, mmd->simple); BIF_undo_push("Multires subdivide"); } } @@ -2477,10 +2477,13 @@ static void draw_modifier(uiBlock *block, Object *ob, ModifierData *md, int *xco uiBlockEndAlign(block); } else if (md->type==eModifierType_Multires) { MultiresModifierData *mmd = (MultiresModifierData*) md; + char subsurfmenu[]= "Subsurf Type%t|Catmull-Clark%x0|Simple Subdiv.%x1"; uiBut *but; but = uiDefBut(block,BUT,B_MODIFIER_RECALC,"Subdivide", lx,(cy-=19),buttonWidth,19,0,0,0,0,0,"Increase the resolution of displacements"); uiButSetFunc(but, multiresModifier_subdivide_button, mmd, ob); + + uiDefButC(block, MENU, B_NOP, subsurfmenu, lx, (cy-=19), buttonWidth, 19, &mmd->simple, 0, 0, 0, 0, "Selects type of subdivision algorithm."); but = uiDefButC(block,NUM,B_MODIFIER_RECALC,"Level: ",lx,(cy-=19),buttonWidth,19, &mmd->lvl, 1.0, mmd->totlvl, 0,0,""); uiButSetFunc(but, multiresModifier_setLevel, mmd, ob); |