diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2016-03-28 16:37:08 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-04-05 11:36:09 +0300 |
| commit | 611e544191fa7fa89ed299c5aa3ab9ea5a82bdfe (patch) | |
| tree | 988069f0c2552054c6b995ae21bde9ea20d5bb00 /source/blender | |
| parent | 8aed4495280b5caf6faca2609c0eb044f572646c (diff) | |
Fix T47972: Blender crash showing particle system.
Do same as with faces - if no orcodata is available, fill orco with current location...
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/blenkernel/intern/particle.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/particle.c b/source/blender/blenkernel/intern/particle.c index 364bdbb5516..221bb6df523 100644 --- a/source/blender/blenkernel/intern/particle.c +++ b/source/blender/blenkernel/intern/particle.c @@ -1609,8 +1609,14 @@ void psys_particle_on_dm(DerivedMesh *dm_final, int from, int index, int index_d normalize_v3(nor); } - if (orco) - copy_v3_v3(orco, orcodata[mapindex]); + if (orco) { + if (orcodata) { + copy_v3_v3(orco, orcodata[mapindex]); + } + else { + copy_v3_v3(orco, vec); + } + } if (ornor) { dm_final->getVertNo(dm_final, mapindex, ornor); |