diff options
| author | Ton Roosendaal <ton@blender.org> | 2004-09-17 14:36:43 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2004-09-17 14:36:43 +0400 |
| commit | 8464889c80c51a975c134133f88990aa788ee0a3 (patch) | |
| tree | 3aadc4b51c1ef1bc20d92422e9b6aca94fb20702 /source | |
| parent | a539a727d42fa207ebbb07c83f7670c18859c2fb (diff) | |
Fixed crash caused by new (strict) rule for displists. Reminder: to signal
that a displist has to be recalculated, you only have to free it.
In the init_render_mesh() not all situations were checked OK.
Thanks Basse for finding it!
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/renderconverter/intern/convertBlenderScene.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/renderconverter/intern/convertBlenderScene.c b/source/blender/renderconverter/intern/convertBlenderScene.c index be5c04c3c7f..a022db0d3a2 100644 --- a/source/blender/renderconverter/intern/convertBlenderScene.c +++ b/source/blender/renderconverter/intern/convertBlenderScene.c @@ -1249,7 +1249,7 @@ static void init_render_mesh(Object *ob) /* object_deform changes imat! */ do_puno= mesh_modifier(ob, 's'); - + paf = give_parteff(ob); if(paf) { if(paf->flag & PAF_STATIC) render_static_particle_system(ob, paf); @@ -1294,9 +1294,9 @@ static void init_render_mesh(Object *ob) /* Force a displist rebuild if this is a subsurf and we have a different subdiv level */ - if((dl==0) || ((me->subdiv != me->subdivr))) { + if((dl==NULL) || ((me->subdiv != me->subdivr))) { /* prevent subsurf called again for duplicate use of mesh, tface pointers change */ - if((me->subdivdone-1)!=me->subdivr) { + if(dl==NULL || (me->subdivdone-1)!=me->subdivr) { DispList *dlVerts; dlVerts= find_displist(&ob->disp, DL_VERTS); |