griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

- Lattice as parent of Metaball affect deforming of polygonized implicit surface

Browse Source 
- fixed compile problem at IRIX with buttons_editing.c (look at JWalton's message in mailing list) ... sorry for mixed commit :-(
This commit is contained in:
Jiri Hnidek
2003-10-14 12:09:57 +00:00
parent 4629da0ffa
commit d26e8b1a04
3 changed files with 13 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/blenkernel/intern/displist.c
View File

@@ -1460,6 +1460,8 @@ void makeDispList(Object *ob)
metaball_polygonize(ob);
tex_space_mball(ob);
object_deform(ob);
}
else if(ob->type==OB_SURF) {

9
source/blender/blenkernel/intern/lattice.c
View File

@@ -418,6 +418,15 @@ int object_deform(Object *ob)
}
}
}
else if(ob->type==OB_MBALL) {
dl=ob->disp.first;
while(dl) {
fp = dl->verts;
for(a=0;a<dl->nr;a++,fp+=3)
calc_latt_deform(fp);
dl=dl->next;
}
}
else if ELEM(ob->type, OB_CURVE, OB_SURF) {
cu= ob->data;

3
source/blender/src/buttons_editing.c
View File

@@ -1760,6 +1760,7 @@ static void editing_panel_materials(Object *ob)
float min;
Material *ma;
char str[64];
uiBut *but;
block= uiNewBlock(&curarea->uiblocks, "editing_panel_materials", UI_EMBOSSX, UI_HELV, curarea->win);
if(uiNewPanel(curarea, block, "Link and Materials", "Editing", 0, 0, 318, 204)==0) return;
@@ -1807,7 +1808,7 @@ static void editing_panel_materials(Object *ob)
}
if(ob) {
uiBlockSetCol(block, BUTGREY);
uiBut *but= uiDefBut(block, TEX, B_IDNAME, "OB:", xco, 180, 454-xco, YIC, ob->id.name+2, 0.0, 19.0, 0, 0, "Displays Active Object name. Click to change.");
but = uiDefBut(block, TEX, B_IDNAME, "OB:", xco, 180, 454-xco, YIC, ob->id.name+2, 0.0, 19.0, 0, 0, "Displays Active Object name. Click to change.");
uiButSetFunc(but, test_idbutton_cb, ob->id.name, NULL);
}