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

Bug fix #2016

Browse Source 
Particles added to mesh being deformed with Armature crashes.
Bug introduced with 2.33, particle collisions... leon added some fancy
updates for actions and armature displists there, which are highly
disputable. I left it in, because I didn't see it was actually new.

Note: particles added while updating mesh with armatures is not supported,
it will shoot particles from original location.
What does work, is static particles.
This commit is contained in:
Ton Roosendaal 2004-12-14 18:12:30 +00:00
parent 65d5d124d0
commit f3106212e8
1 changed files with 0 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/blender/blenkernel/intern/effect.c
View File

@ -1131,7 +1131,6 @@ void build_particle_system(Object *ob)
MVert *mvert; MVert *mvert;
MTex *mtexmove=0; MTex *mtexmove=0;
Material *ma; Material *ma;
int armature_parent;
float framelenont, ftime, dtime, force[3], imat[3][3], vec[3]; float framelenont, ftime, dtime, force[3], imat[3][3], vec[3];
float fac, prevobmat[4][4], sfraont, co[3]; float fac, prevobmat[4][4], sfraont, co[3];
int deform=0, a, cur, cfraont, cfralast, totpart; int deform=0, a, cur, cfraont, cfralast, totpart;
@ -1199,16 +1198,9 @@ void build_particle_system(Object *ob)
/* set it all at first frame */ /* set it all at first frame */
G.scene->r.cfra= cfralast= (int)floor(ftime); G.scene->r.cfra= cfralast= (int)floor(ftime);
par= ob; par= ob;
armature_parent = 0;
while(par) { while(par) {
/* do_ob_ipo(par); */ /* do_ob_ipo(par); */
do_ob_key(par); do_ob_key(par);
/* Just checking whether theres an armature in the */
/* parent chain of the emitter, so we know whether */
/* to recalculate the armatures */
if(par->type==OB_ARMATURE) {
armature_parent = 1;
}
par= par->parent; par= par->parent;
} }
@ -1274,12 +1266,6 @@ void build_particle_system(Object *ob)
/* added later: blur? */ /* added later: blur? */
bsystem_time(ob, ob->parent, (float)G.scene->r.cfra, 0.0); bsystem_time(ob, ob->parent, (float)G.scene->r.cfra, 0.0);
/* Update the armatures */
if (armature_parent) {
do_all_actions();
rebuild_all_armature_displists();
}
par= ob; par= ob;
while(par) { while(par) {
@ -1355,13 +1341,6 @@ void build_particle_system(Object *ob)
G.scene->r.framelen= framelenont; G.scene->r.framelen= framelenont;
give_mesh_mvert(0, 0, 0, 0,paf->seed); give_mesh_mvert(0, 0, 0, 0,paf->seed);
/*Restore armature settings*/
if((paf->flag & PAF_STATIC)==0) {
if (armature_parent) {
do_all_actions();
rebuild_all_armature_displists();
}
}
/* put hierarchy back */ /* put hierarchy back */
par= ob; par= ob;
while(par) { while(par) {