diff options
| author | Ton Roosendaal <ton@blender.org> | 2007-05-08 22:51:40 +0400 |
|---|---|---|
| committer | Ton Roosendaal <ton@blender.org> | 2007-05-08 22:51:40 +0400 |
| commit | e05125b9bdf096796cf71106fe27ec88030934ef (patch) | |
| tree | f1d80079d060a926bc6ecaa001df89498c7e0cb8 /source | |
| parent | d50ea1bbe39e49db629834b8e0f625290f685df4 (diff) | |
Bugfix #6663
Metaballs, when in editmode, didnt show correct after a render (it was
drawing render resol then).
The code here was confused some... this works, although it will take a
bit more cpu cycles when render resol = display resol. No biggie.
Diffstat (limited to 'source')
| -rw-r--r-- | source/blender/render/intern/source/convertblender.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/source/blender/render/intern/source/convertblender.c b/source/blender/render/intern/source/convertblender.c index afa9aa0b2e4..9f032d39d22 100644 --- a/source/blender/render/intern/source/convertblender.c +++ b/source/blender/render/intern/source/convertblender.c @@ -1544,7 +1544,7 @@ static void sort_halos(Render *re) /* ------------------------------------------------------------------------- */ static void init_render_mball(Render *re, Object *ob) { - DispList *dl, *dlo; + DispList *dl; VertRen *ver; VlakRen *vlr, *vlr1; Material *ma; @@ -1564,10 +1564,7 @@ static void init_render_mball(Render *re, Object *ob) if(ma->texco & TEXCO_ORCO) { need_orco= 1; } - - dlo= ob->disp.first; - if(dlo) BLI_remlink(&ob->disp, dlo); - + makeDispListMBall(ob); dl= ob->disp.first; if(dl==0) return; @@ -1632,13 +1629,11 @@ static void init_render_mball(Render *re, Object *ob) if(need_orco) { /* store displist and scale */ make_orco_mball(ob); - if(dlo) BLI_addhead(&ob->disp, dlo); } - else { - freedisplist(&ob->disp); - if(dlo) BLI_addtail(&ob->disp, dlo); - } + + /* enforce display lists remade */ + freedisplist(&ob->disp); } /* ------------------------------------------------------------------------- */ /* convert */ |