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

Fix #35966: remesh modifier + particle use modifier stack option did not work

Browse Source 
well together.
This commit is contained in:
Brecht Van Lommel
2013-07-02 19:17:34 +00:00
parent d6c14ed855
commit a30dc7c74e
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
source/blender/blenkernel/intern/particle_system.c
View File

@@ -421,23 +421,24 @@ void psys_calc_dmcache(Object *ob, DerivedMesh *dm, ParticleSystem *psys)
continue; continue;
} }
if (psys->part->from == PART_FROM_VERT) { if (use_modifier_stack) {
if (pa->num < totelem && nodearray[pa->num]) if (pa->num < totelem)
pa->num_dmcache= GET_INT_FROM_POINTER(nodearray[pa->num]->link); pa->num_dmcache = DMCACHE_ISCHILD;
else else
pa->num_dmcache = DMCACHE_NOTFOUND; pa->num_dmcache = DMCACHE_NOTFOUND;
} }
else { /* FROM_FACE/FROM_VOLUME */ else {
/* Note that sometimes the pa->num is over the nodearray size, this is bad, maybe there is a better place to fix this, if (psys->part->from == PART_FROM_VERT) {
* but for now passing NULL is OK. every face will be searched for the particle so its slower - Campbell */
if (use_modifier_stack) {
if (pa->num < totelem && nodearray[pa->num]) if (pa->num < totelem && nodearray[pa->num])
pa->num_dmcache = GET_INT_FROM_POINTER(nodearray[pa->num]->link); pa->num_dmcache= GET_INT_FROM_POINTER(nodearray[pa->num]->link);
else else
pa->num_dmcache = DMCACHE_NOTFOUND; pa->num_dmcache = DMCACHE_NOTFOUND;
} }
else else { /* FROM_FACE/FROM_VOLUME */
/* Note that sometimes the pa->num is over the nodearray size, this is bad, maybe there is a better place to fix this,
* but for now passing NULL is OK. every face will be searched for the particle so its slower - Campbell */
pa->num_dmcache= psys_particle_dm_face_lookup(ob, dm, pa->num, pa->fuv, pa->num < totelem ? nodearray[pa->num] : NULL); pa->num_dmcache= psys_particle_dm_face_lookup(ob, dm, pa->num, pa->fuv, pa->num < totelem ? nodearray[pa->num] : NULL);
}
} }
} }