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

Bugfix:

Browse Source 
Drawing linked duplicates in editmode leaked memory, and could
also crash. This fixes the memory leak, and hopefully also the
crash.
This commit is contained in:
Brecht Van Lommel
2007-11-14 22:56:32 +00:00
parent 41c6758027
commit 0fae1fdad3
2 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/src/drawimage.c
View File

@@ -530,7 +530,7 @@ void draw_uvs_sima(void)
) { ) {
/* we can use the existing final mesh */ /* we can use the existing final mesh */
glColor3ub(112, 112, 112); glColor3ub(112, 112, 112);
G.editMesh->derivedFinal->drawUVEdges(G.editMesh->derivedFinal); em->derivedFinal->drawUVEdges(em->derivedFinal);
} else { } else {
DerivedMesh *finalDM, *cageDM; DerivedMesh *finalDM, *cageDM;

8
source/blender/src/drawobject.c
View File

@@ -2417,15 +2417,9 @@ static int draw_mesh_object(Base *base, int dt, int flag)
if(dt>OB_WIRE) init_gl_materials(ob, 0); // no transp in editmode, the fancy draw over goes bad then if(dt>OB_WIRE) init_gl_materials(ob, 0); // no transp in editmode, the fancy draw over goes bad then
draw_em_fancy(ob, G.editMesh, cageDM, finalDM, dt); draw_em_fancy(ob, G.editMesh, cageDM, finalDM, dt);
/* TODO, not 100% sure this is correct, if (G.obedit!=ob && finalDM)
* however I could not make it crash or leak ram with different
* linked-dup/modifier configurtions,
* should double check whats going on before release - Campbell */
if (cageDM != finalDM) {
cageDM->release(cageDM);
finalDM->release(finalDM); finalDM->release(finalDM);
} }
}
else if(!G.obedit && (G.f & G_SCULPTMODE) &&(G.scene->sculptdata.flags & SCULPT_DRAW_FAST) && else if(!G.obedit && (G.f & G_SCULPTMODE) &&(G.scene->sculptdata.flags & SCULPT_DRAW_FAST) &&
OBACT==ob && !sculpt_modifiers_active(ob)) { OBACT==ob && !sculpt_modifiers_active(ob)) {
sculptmode_draw_mesh(0); sculptmode_draw_mesh(0);