[Bf-blender-cvs] [2fe7e60] master: Fix T45563: Crash rendering hair dupli's
Campbell Barton
noreply at git.blender.org
Mon Jul 27 02:09:39 CEST 2015
Commit: 2fe7e6063382f714872d044e950da007528d064c
Author: Campbell Barton
Date: Mon Jul 27 10:02:41 2015 +1000
Branches: master
https://developer.blender.org/rB2fe7e6063382f714872d044e950da007528d064c
Fix T45563: Crash rendering hair dupli's
===================================================================
M source/blender/render/intern/source/convertblender.c
===================================================================
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c
index e51ff91..703cc4b 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);
More information about the Bf-blender-cvs
mailing list