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

- bugfix #178

Browse Source 
Well, it fixes the crash, but the cause can still be in wrong freeing
  memory when deleting strips...
  Hos; I leave in the bugreport with a note for you
This commit is contained in:
Ton Roosendaal
2003-07-21 21:21:15 +00:00
parent d2fe1ea50a
commit bf23ed161e
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/blender/src/drawnla.c
View File

@@ -113,22 +113,24 @@ static void draw_nlatree(void)
glColor3ub(0x00, 0x00, 0x00); glColor3ub(0x00, 0x00, 0x00);
x = 0.0; x = 0.0;
y = count_nla_levels(); y = count_nla_levels();
y*= (NLACHANNELHEIGHT+NLACHANNELSKIP); y*= (NLACHANNELHEIGHT+NLACHANNELSKIP);
for (base=G.scene->base.first; base; base=base->next){ for (base=G.scene->base.first; base; base=base->next){
if (nla_filter(base, 0)){ if (nla_filter(base, 0)){
cpack (0xAAAAAA); cpack (0xAAAAAA);
glRectf(x, y-NLACHANNELHEIGHT/2, (float)NLAWIDTH, y+NLACHANNELHEIGHT/2); glRectf(x, y-NLACHANNELHEIGHT/2, (float)NLAWIDTH, y+NLACHANNELHEIGHT/2);
/* Draw the name / ipo timeline*/ /* Draw the name / ipo timeline*/
if (TESTBASE_SAFE(base)) if (TESTBASE_SAFE(base))
cpack(0xFFFFFF); cpack(0xFFFFFF);
else else
cpack (0x000000); cpack (0x000000);
glRasterPos2f(x+16, y-4); glRasterPos2f(x+16, y-4);
BMF_DrawString(G.font, base->object->id.name+2); BMF_DrawString(G.font, base->object->id.name+2);
/* Draw the constraint ipos */ /* Draw the constraint ipos */
@@ -160,7 +162,6 @@ static void draw_nlatree(void)
cpack(0xFFFFFF); cpack(0xFFFFFF);
else else
cpack (0x000000); cpack (0x000000);
glRasterPos2f(x+32, y-4); glRasterPos2f(x+32, y-4);
BMF_DrawString(G.font, base->object->action->id.name+2); BMF_DrawString(G.font, base->object->action->id.name+2);
} }
@@ -178,11 +179,13 @@ static void draw_nlatree(void)
else else
cpack (0x000000); cpack (0x000000);
glRasterPos2f(x+48, y-4); // why this test? check freeing mem when deleting strips? (ton)
BMF_DrawString(G.font, strip->act->id.name+2); if(strip->act) {
glRasterPos2f(x+48, y-4);
y-=(NLACHANNELHEIGHT+NLACHANNELSKIP); BMF_DrawString(G.font, strip->act->id.name+2);
y-=(NLACHANNELHEIGHT+NLACHANNELSKIP);
}
} }
} }
} }