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

Fix T40052, Grid Particles Crash due to invalid empty mesh verts access

Browse Source 
for bbox calculation.
This commit is contained in:
Lukas Tönne
2014-05-07 07:56:47 +02:00
parent 0710d9dfd1
commit 77d11a52b3
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -489,15 +489,19 @@ static void distribute_grid(DerivedMesh *dm, ParticleSystem *psys)
int totvert=dm->getNumVerts(dm), from=psys->part->from;
int i, j, k, p, res=psys->part->grid_res, size[3], axis;
mv=mvert;
/* find bounding box of dm */
copy_v3_v3(min, mv->co);
copy_v3_v3(max, mv->co);
mv++;
for (i=1; i<totvert; i++, mv++) {
minmax_v3v3_v3(min, max, mv->co);
if (totvert > 0) {
mv=mvert;
copy_v3_v3(min, mv->co);
copy_v3_v3(max, mv->co);
mv++;
for (i = 1; i < totvert; i++, mv++) {
minmax_v3v3_v3(min, max, mv->co);
}
}
else {
zero_v3(min);
zero_v3(max);
}
sub_v3_v3v3(delta, max, min);