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

Fix T45563: Crash rendering hair dupli's

Browse Source
This commit is contained in:
Campbell Barton
2015-07-27 10:02:41 +10:00
parent 27a20c2c60
commit 2fe7e60633
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/render/intern/source/convertblender.c
View File

@@ -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); dupli_render_particle_set(re, ob, timeoffset, 0, 1);
duplilist = object_duplilist(re->eval_ctx, re->scene, ob); duplilist = object_duplilist(re->eval_ctx, re->scene, ob);
duplilist_apply_data = duplilist_apply(ob, NULL, duplilist); 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) { for (dob= duplilist->first, i = 0; dob; dob= dob->next, ++i) {
DupliExtraData *dob_extra = &duplilist_apply_data->extra[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; if (re->test_break(re->tbh)) break;
} }
/* restore particle system */
dupli_render_particle_set(re, ob, timeoffset, 0, false);
if (duplilist_apply_data) { if (duplilist_apply_data) {
duplilist_restore(duplilist, duplilist_apply_data); duplilist_restore(duplilist, duplilist_apply_data);
duplilist_free_apply_data(duplilist_apply_data); duplilist_free_apply_data(duplilist_apply_data);