- readded DL_VERTS type to store lattice deformed verts
- new feature, twiddled with lattice resizing to try to maintain existing vertex changes... much nicer than just resetting the lattice if you decide you need more detail in the lattice. - modifiers work with lattices now. yes, that does mean you can make a chain of lattices effecting each other 8 miles long. - some cleanup of softbody code, was rather splintered and call path was twisted and confusing. reworked main object step routine to do things in a more obvious and consistent manner and without duplicate code - added ob->softflag OB_SB_RESET instead of sbObjectReset call - modifier changes reset softbody now - moved curve_getVertexCos/curve_applyVertexCos into curve.c - update curve modifier eval to work with virtual modifiers - update modifier apply to work with curves/surfs - update make parent to also recalc object data NOTE: Although you can turn SB on for curve/font objects at the moment it doesn't really work because they call deform in multiple steps and this confuses SB. Not sure how to deal with atm.
This commit is contained in:
@@ -1044,7 +1044,7 @@ static void softbody_bake(Object *ob)
|
||||
G.scene->r.framelen= 1.0; // baking has to be in uncorrected time
|
||||
CFRA= sb->sfra;
|
||||
update_for_newframe_muted(); // put everything on this frame
|
||||
sbObjectToSoftbody(ob, NULL); // put softbody in restposition
|
||||
sbObjectToSoftbody(ob); // put softbody in restposition
|
||||
ob->softflag |= OB_SB_BAKEDO;
|
||||
|
||||
curarea->win_swap= 0; // clean swapbuffers
|
||||
@@ -1069,7 +1069,7 @@ static void softbody_bake(Object *ob)
|
||||
if(event==ESCKEY) break;
|
||||
}
|
||||
|
||||
if(event==ESCKEY) sbObjectToSoftbody(ob, NULL); // clears all
|
||||
if(event==ESCKEY) sbObjectToSoftbody(ob); // clears all
|
||||
|
||||
/* restore */
|
||||
waitcursor(0);
|
||||
@@ -1157,7 +1157,7 @@ void do_object_panels(unsigned short event)
|
||||
break;
|
||||
case B_SOFTBODY_BAKE_FREE:
|
||||
ob= OBACT;
|
||||
if(ob && ob->soft) sbObjectToSoftbody(ob, NULL);
|
||||
if(ob && ob->soft) sbObjectToSoftbody(ob);
|
||||
allqueue(REDRAWBUTSOBJECT, 0);
|
||||
allqueue(REDRAWVIEW3D, 0);
|
||||
break;
|
||||
|
||||
Reference in New Issue
Block a user