diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-07-27 03:02:41 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2015-07-27 03:04:20 +0300 |
| commit | 2fe7e6063382f714872d044e950da007528d064c (patch) | |
| tree | d69ed6781799b64dc14b7127f2e1858f4a47f485 /source/blender/render | |
| parent | 27a20c2c607c1437720234f57c8ff8297673b4ef (diff) | |
Fix T45563: Crash rendering hair dupli's
Diffstat (limited to 'source/blender/render')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index e51ff91450e..703cc4bddd9 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -5005,7 +5005,9 @@ static void database_init_objects(Render *re, unsigned int renderlay, int nolamp dupli_render_particle_set(re, ob, timeoffset, 0, 1); duplilist = object_duplilist(re->eval_ctx, re->scene, ob); duplilist_apply_data = duplilist_apply(ob, NULL, duplilist); - dupli_render_particle_set(re, ob, timeoffset, 0, 0); + /* postpone 'dupli_render_particle_set', since RE_addRenderInstance reads + * index values from 'dob->persistent_id[0]', referencing 'psys->child' which + * may be smaller once the particle system is restored, see: T45563. */ for (dob= duplilist->first, i = 0; dob; dob= dob->next, ++i) { DupliExtraData *dob_extra = &duplilist_apply_data->extra[i]; @@ -5098,6 +5100,9 @@ static void database_init_objects(Render *re, unsigned int renderlay, int nolamp if (re->test_break(re->tbh)) break; } + /* restore particle system */ + dupli_render_particle_set(re, ob, timeoffset, 0, false); + if (duplilist_apply_data) { duplilist_restore(duplilist, duplilist_apply_data); duplilist_free_apply_data(duplilist_apply_data); |