archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Bugfix for "ghost feathers" trailing one frame behind the character.

Browse Source 
The derivedmesh and particle system needed to be evaluated at render
level before creating dupliparticles.
This commit is contained in:
Brecht Van Lommel
2008-01-17 12:02:15 +00:00
parent 243f4530ef
commit 16a37bcd31
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2199,6 +2199,7 @@ void object_handle_update(Object *ob)
if(ob->particlesystem.first) {
ParticleSystem *tpsys, *psys;
DerivedMesh *dm;
psys= ob->particlesystem.first;
while(psys) {
@@ -2215,6 +2216,14 @@ void object_handle_update(Object *ob)
else
psys= psys->next;
}
if(G.rendering && ob->transflag & OB_DUPLIPARTS) {
/* this is to make sure we get render level duplis in groups:
* the derivedmesh must be created before init_render_mesh,
* since object_duplilist does dupliparticles before that */
dm = mesh_create_derived_render(ob, CD_MASK_BAREMESH|CD_MASK_MTFACE|CD_MASK_MCOL);
dm->release(dm);
}
}
}

7
source/blender/render/intern/source/convertblender.c
View File

@@ -4136,18 +4136,11 @@ static void dupli_render_particle_set(Render *re, Object *ob, int level, int ena
return;
if(ob->transflag & OB_DUPLIPARTS) {
DerivedMesh *dm;
for(psys=ob->particlesystem.first; psys; psys=psys->next)
if(enable)
psys_render_set(ob, psys, re->viewmat, re->winmat, re->winx, re->winy);
else
psys_render_restore(ob, psys);
if(enable) {
dm = mesh_create_derived_render(ob, CD_MASK_BAREMESH|CD_MASK_MTFACE|CD_MASK_MCOL);
dm->release(dm);
}
}
if(ob->dup_group==NULL) return;