diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-10-27 02:38:12 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-10-27 02:38:12 +0400 |
| commit | 01da2c0e53e8a3faf08375027ced7e7fb153726b (patch) | |
| tree | c20ab3c713d0bee51390c0d8f51ff4356630b268 /source/blender | |
| parent | 9f32e83175448eaf654cc228caa70065d63df13a (diff) | |
fix [#37195] particles crash with viewport render
Diffstat (limited to 'source/blender')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index 8e90ddbb42b..b4873e7d310 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -1836,9 +1836,11 @@ static int render_new_particle_system(Render *re, ObjectRen *obr, ParticleSystem if (strandbuf) { int orignum = (index_mf_to_mpoly) ? DM_origindex_mface_mpoly(index_mf_to_mpoly, index_mp_to_orig, cpa->num) : cpa->num; - if (orignum > sbound - strandbuf->bound) { - sbound= strandbuf->bound + orignum; - sbound->start= sbound->end= obr->totstrand; + if ((orignum > sbound - strandbuf->bound) && + (orignum < strandbuf->totbound)) + { + sbound = &strandbuf->bound[orignum]; + sbound->start = sbound->end = obr->totstrand; } } } |