Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix crash when trying to decimate baked fcurve channels

Browse Source 
No curve data was available for the modal decimate operator.
Added a check for when the curve has baked data.
This commit is contained in:
Sebastian Parborg
2019-12-06 16:58:14 +01:00
parent 593d972407
commit 19a89797c3
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/blender/editors/space_graph/graph_edit.c
View File

@@ -1375,9 +1375,14 @@ static void decimate_reset_bezts(tDecimateGraphOp *dgo)
ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype); ANIM_animdata_filter(ac, &anim_data, filter, ac->data, ac->datatype);
/* Loop through filtered data and reset bezts. */ /* Loop through filtered data and reset bezts. */
for (ale = anim_data.first, link_bezt = dgo->bezt_arr_list.first; ale; for (ale = anim_data.first, link_bezt = dgo->bezt_arr_list.first; ale; ale = ale->next) {
ale = ale->next, link_bezt = link_bezt->next) {
FCurve *fcu = (FCurve *)ale->key_data; FCurve *fcu = (FCurve *)ale->key_data;
if (fcu->bezt == NULL) {
/* This curve is baked, skip it */
continue;
}
tBeztCopyData *data = link_bezt->data; tBeztCopyData *data = link_bezt->data;
const int arr_size = sizeof(BezTriple) * data->tot_vert; const int arr_size = sizeof(BezTriple) * data->tot_vert;
@@ -1388,6 +1393,8 @@ static void decimate_reset_bezts(tDecimateGraphOp *dgo)
fcu->totvert = data->tot_vert; fcu->totvert = data->tot_vert;
memcpy(fcu->bezt, data->bezt, arr_size); memcpy(fcu->bezt, data->bezt, arr_size);
link_bezt = link_bezt->next;
} }
ANIM_animdata_freelist(&anim_data); ANIM_animdata_freelist(&anim_data);
@@ -1413,7 +1420,9 @@ static void decimate_exit(bContext *C, wmOperator *op)
BLI_freelistN(&dgo->bezt_arr_list); BLI_freelistN(&dgo->bezt_arr_list);
MEM_freeN(dgo); MEM_freeN(dgo);
/* Return to normal cursor and header status. */
WM_cursor_modal_restore(win); WM_cursor_modal_restore(win);
ED_area_status_text(dgo->sa, NULL);
/* cleanup */ /* cleanup */
op->customdata = NULL; op->customdata = NULL;
@@ -1497,6 +1506,12 @@ static int graphkeys_decimate_invoke(bContext *C, wmOperator *op, const wmEvent
/* Loop through filtered data and copy the curves. */ /* Loop through filtered data and copy the curves. */
for (ale = anim_data.first; ale; ale = ale->next) { for (ale = anim_data.first; ale; ale = ale->next) {
FCurve *fcu = (FCurve *)ale->key_data; FCurve *fcu = (FCurve *)ale->key_data;
if (fcu->bezt == NULL) {
/* This curve is baked, skip it */
continue;
}
const int arr_size = sizeof(BezTriple) * fcu->totvert; const int arr_size = sizeof(BezTriple) * fcu->totvert;
tBeztCopyData *copy = MEM_mallocN(sizeof(tBeztCopyData), "bezts_copy"); tBeztCopyData *copy = MEM_mallocN(sizeof(tBeztCopyData), "bezts_copy");
@@ -1518,6 +1533,13 @@ static int graphkeys_decimate_invoke(bContext *C, wmOperator *op, const wmEvent
ANIM_animdata_freelist(&anim_data); ANIM_animdata_freelist(&anim_data);
} }
if (dgo->bezt_arr_list.first == NULL) {
WM_report(RPT_WARNING,
"Fcurve Decimate: Can't decimate baked channels. Unbake them and try again.");
decimate_exit(C, op);
return OPERATOR_CANCELLED;
}
WM_event_add_modal_handler(C, op); WM_event_add_modal_handler(C, op);
return OPERATOR_RUNNING_MODAL; return OPERATOR_RUNNING_MODAL;
} }
@@ -1556,8 +1578,6 @@ static int graphkeys_decimate_modal(bContext *C, wmOperator *op, const wmEvent *
case RETKEY: case RETKEY:
case PADENTER: { case PADENTER: {
if (event->val == KM_PRESS) { if (event->val == KM_PRESS) {
ED_area_status_text(dgo->sa, NULL);
decimate_exit(C, op); decimate_exit(C, op);
return OPERATOR_FINISHED; return OPERATOR_FINISHED;
@@ -1568,9 +1588,6 @@ static int graphkeys_decimate_modal(bContext *C, wmOperator *op, const wmEvent *
case ESCKEY: /* cancel */ case ESCKEY: /* cancel */
case RIGHTMOUSE: { case RIGHTMOUSE: {
if (event->val == KM_PRESS) { if (event->val == KM_PRESS) {
/* Return to normal cursor and header status. */
ED_area_status_text(dgo->sa, NULL);
decimate_reset_bezts(dgo); decimate_reset_bezts(dgo);
WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL); WM_event_add_notifier(C, NC_ANIMATION | ND_KEYFRAME | NA_EDITED, NULL);