griefith/test
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Bugfix #17720

Browse Source 
Retopo crashed on undo-redo, caused by bad copying of data for undo stack.
I solved crash or corruptions, but it still is pretty weak code here.
This commit is contained in:
Ton Roosendaal
2008-10-04 11:04:09 +00:00
parent 5298e26b76
commit 046810929e
1 changed files with 28 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
source/blender/src/retopo.c
View File

@@ -86,7 +86,23 @@ typedef struct RetopoPaintHit {
} RetopoPaintHit;
static void retopo_do_2d(View3D *v3d, double proj[2], float *v, char adj);
static void retopo_paint_debug_print(RetopoPaintData *rpd);
#if 0
static void retopo_paint_debug_print(RetopoPaintData *rpd)
{
RetopoPaintLine *l;
RetopoPaintPoint *p;
for(l= rpd->lines.first; l; l= l->next) {
printf("Line:\n");
for(p= l->points.first; p; p= p->next) {
printf(" Point(%d: %d,%d)\n",p->index,p->loc.x,p->loc.y);
}
}
fflush(stdout);
}
#endif
/* Painting */
RetopoPaintData *get_retopo_paint_data(void)
@@ -708,17 +724,22 @@ RetopoPaintData *retopo_paint_data_copy(RetopoPaintData *rpd)
memcpy(copy,rpd,sizeof(RetopoPaintData));
copy->lines.first= copy->lines.last= NULL;
copy->nearest.next= copy->nearest.prev= NULL;
copy->nearest.line= NULL;
copy->nearest.first= 0;
for(l= rpd->lines.first; l; l= l->next) {
lcp= MEM_mallocN(sizeof(RetopoPaintLine),"RetopoPaintLineCopy");
memcpy(lcp,l,sizeof(RetopoPaintLine));
BLI_addtail(&copy->lines,lcp);
lcp= MEM_dupallocN(l);
BLI_addtail(&copy->lines, lcp);
lcp->hitlist.first= lcp->hitlist.last= NULL;
lcp->points.first= lcp->points.last= NULL;
lcp->cyclic= NULL;
for(p= l->points.first; p; p= p->next) {
pcp= MEM_mallocN(sizeof(RetopoPaintPoint),"RetopoPaintPointCopy");
memcpy(pcp,p,sizeof(RetopoPaintPoint));
BLI_addtail(&lcp->points,pcp);
pcp= MEM_dupallocN(p);
BLI_addtail(&lcp->points, pcp);
pcp->eve= NULL;
}
}
@@ -904,18 +925,3 @@ void retopo_free_view_data(View3D *v3d)
v3d->retopo_view_data= NULL;
}
}
static void retopo_paint_debug_print(RetopoPaintData *rpd)
{
RetopoPaintLine *l;
RetopoPaintPoint *p;
for(l= rpd->lines.first; l; l= l->next) {
printf("Line:\n");
for(p= l->points.first; p; p= p->next) {
printf(" Point(%d: %d,%d)\n",p->index,p->loc.x,p->loc.y);
}
}
fflush(stdout);
}