Particles

=========

- Fix for bug #7837: circle drawtype + velocity crashed.
- Setting density vertex group didn't do proper refresh.

Mesh Deform Modifier
====================

- Make it work for nurbs and curves.
This commit is contained in:
2007-11-27 13:20:51 +00:00
parent 38e3abae83
commit 2fa5e8fdc9
3 changed files with 8 additions and 3 deletions

View File

@@ -1596,6 +1596,12 @@ static void modifiers_bindMeshDeform(void *ob_v, void *md_v)
else if(ob->type == OB_LATTICE) {
lattice_calc_modifiers(ob);
}
else if(ob->type==OB_MBALL) {
makeDispListMBall(ob);
}
else if(ELEM3(ob->type, OB_CURVE, OB_SURF, OB_FONT)) {
makeDispListCurveTypes(ob, 0);
}
mmd->needbind= 0;
mmd->modifier.mode= mode;

View File

@@ -3766,7 +3766,7 @@ static void object_panel_particle_extra(Object *ob)
butx+=butw;
uiDefButS(block, MENU, B_PART_REDRAW, menustr, butx,buty,buth,buth, psys->vgroup+vgnum, 0, defCount, 0, 0, "Browses available vertex groups");
but= uiDefButS(block, MENU, B_PART_REDRAW, menustr, butx,buty,buth,buth, psys->vgroup+vgnum, 0, defCount, 0, 0, "Browses available vertex groups");
uiButSetFunc(but, particle_set_vg, (void *)ob, (void *)(&vgnum));
MEM_freeN (menustr);

View File

@@ -3407,10 +3407,9 @@ static void draw_new_particle_system(Base *base, ParticleSystem *psys)
/* 6. */
glGetIntegerv(GL_POLYGON_MODE, polygonmode);
if(draw_as != PART_DRAW_CIRC){
glDisableClientState(GL_NORMAL_ARRAY);
if(draw_as != PART_DRAW_CIRC){
if(draw_as==PART_DRAW_PATH){
ParticleCacheKey **cache, *path;
float *cd2=0,*cdata2=0;