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

Bugfix #5476

Browse Source 
Lattice deforming a Particle system only supported regular parent relation-
ship, not modifiers.
This commit is contained in:
Ton Roosendaal
2006-12-23 11:56:22 +00:00
parent 8eb1d00e0d
commit 397b09e477
3 changed files with 59 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -76,6 +76,7 @@
#include "BKE_mesh.h"
#include "BKE_material.h"
#include "BKE_main.h"
#include "BKE_modifier.h"
#include "BKE_object.h"
#include "BKE_scene.h"
#include "BKE_screen.h"
@@ -1851,8 +1852,11 @@ void build_particle_system(Object *ob)
if( paf->flag & PAF_STATIC ) deform= 0;
else {
deform= (ob->parent && ob->parent->type==OB_LATTICE && ob->partype==PARSKEL);
if(deform) init_latt_deform(ob->parent, 0);
Object *parlatt= modifiers_isDeformedByLattice(ob);
if(parlatt) {
deform= 1;
init_latt_deform(parlatt, 0);
}
}
/* get the effectors */