diff options
| author | Ton Roosendaal <ton@blender.org> | 2006-12-23 14:56:22 +0300 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2006-12-23 14:56:22 +0300 |
| commit | 397b09e477bee436c4ad3663071a862b1d1c5a50 (patch) | |
| tree | ba59fcd679f2e9817749bf0a9be656a2cf20e998 /source/blender/blenkernel/intern/effect.c | |
| parent | 8eb1d00e0d07d33a10febcbe93db2c028562c2ed (diff) | |
Bugfix #5476
Lattice deforming a Particle system only supported regular parent relation-
ship, not modifiers.
Diffstat (limited to 'source/blender/blenkernel/intern/effect.c')
| -rw-r--r-- | source/blender/blenkernel/intern/effect.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/effect.c b/source/blender/blenkernel/intern/effect.c index ad3e2008b9f..69ea60b27bd 100644 --- a/source/blender/blenkernel/intern/effect.c +++ b/source/blender/blenkernel/intern/effect.c @@ -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 */ |