kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

fix [#30542] Shear Vertical Seg Faults Blender

Browse Source 
honor the T_FREE_CUSTOMDATA flag.
This commit is contained in:
Campbell Barton 2012-03-15 00:57:14 +00:00
parent 5788de8408
commit be7477c638
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/blender/editors/transform/transform.c
View File

@ -2454,7 +2454,7 @@ int handleEventShear(TransInfo *t, wmEvent *event)
initMouseInputMode(t, &t->mouse, INPUT_HORIZONTAL_ABSOLUTE);
t->customData = NULL;
}
status = 1;
}

7
source/blender/editors/transform/transform_conversions.c
View File

@ -4204,9 +4204,9 @@ static void freeSeqData(TransInfo *t)
}
}
if (t->customData) {
if ((t->customData != NULL) && (t->flag & T_FREE_CUSTOMDATA)) {
MEM_freeN(t->customData);
t->customData= NULL;
t->customData = NULL;
}
if (t->data) {
MEM_freeN(t->data); // XXX postTrans usually does this
@ -4281,7 +4281,8 @@ static void createTransSeqData(bContext *C, TransInfo *t)
td = t->data = MEM_callocN(t->total*sizeof(TransData), "TransSeq TransData");
td2d = t->data2d = MEM_callocN(t->total*sizeof(TransData2D), "TransSeq TransData2D");
tdsq = t->customData= MEM_callocN(t->total*sizeof(TransDataSeq), "TransSeq TransDataSeq");
tdsq = t->customData = MEM_callocN(t->total*sizeof(TransDataSeq), "TransSeq TransDataSeq");
t->flag |= T_FREE_CUSTOMDATA;

2
source/blender/editors/transform/transform_generics.c
View File

@ -1245,7 +1245,7 @@ void postTrans (bContext *C, TransInfo *t)
/* Can take over freeing t->data and data2d etc... */
t->customFree(t);
}
else if (t->customData) {
else if ((t->customData != NULL) && (t->flag & T_FREE_CUSTOMDATA)) {
MEM_freeN(t->customData);
}