sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Bug fix #3044

Browse Source 
Undid Daniels' commit (version 1.42) for this file, which claimed to fix
"free baked softbody". Result was that baked softbodies couldn't be read
from a file (always were freed).

I tested the free bake, and it works properly. Daniel: your move!
This commit is contained in:
Ton Roosendaal 2005-09-20 10:21:30 +00:00
parent 256a59c36e
commit 0746e7edb3
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/blender/blenkernel/intern/softbody.c
View File

@ -1238,6 +1238,8 @@ static int softbody_baked_step(Object *ob, float framenr, float (*vertexCos)[3],
/* precondition check */ /* precondition check */
if(sb==NULL || sb->keys==NULL || sb->totkey==0) return 0; if(sb==NULL || sb->keys==NULL || sb->totkey==0) return 0;
/* so we got keys, but no bodypoints... even without simul we need it for the bake */
if(sb->bpoint==NULL) sb->bpoint= MEM_callocN( sb->totpoint*sizeof(BodyPoint), "bodypoint");
/* convert cfra time to system time */ /* convert cfra time to system time */
sfra= (float)sb->sfra; sfra= (float)sb->sfra;
@ -1402,7 +1404,12 @@ void sbObjectStep(Object *ob, float framenr, float (*vertexCos)[3], int numVerts
float ctime, forcetime; float ctime, forcetime;
float err; float err;
/* remake softbody if: */ /* baking works with global time */
if(!(ob->softflag & OB_SB_BAKEDO) )
if(softbody_baked_step(ob, framenr, vertexCos, numVerts) ) return;
/* remake softbody if: */
if( (ob->softflag & OB_SB_REDO) || // signal after weightpainting if( (ob->softflag & OB_SB_REDO) || // signal after weightpainting
(ob->soft==NULL) || // just to be nice we allow full init (ob->soft==NULL) || // just to be nice we allow full init
(ob->soft->bpoint==NULL) || // after reading new file, or acceptable as signal to refresh (ob->soft->bpoint==NULL) || // after reading new file, or acceptable as signal to refresh
@ -1426,10 +1433,6 @@ void sbObjectStep(Object *ob, float framenr, float (*vertexCos)[3], int numVerts
ob->softflag &= ~OB_SB_REDO; ob->softflag &= ~OB_SB_REDO;
} }
/* baking works with global time */
if(!(ob->softflag & OB_SB_BAKEDO) )
if(softbody_baked_step(ob, framenr, vertexCos, numVerts) ) return;
sb= ob->soft; sb= ob->soft;
/* still no points? go away */ /* still no points? go away */