blender
/
blender
135
403
Fork 586
Code Issues 6.2k Pull Requests 764 Projects 19 Wiki Activity

Animation: Gaussian Smooth operator for Graph Editor #105635

Merged
Christoph Lendenfeld merged 15 commits from ChrisLend/blender:graph_gauss_smooth into main 2023-03-24 12:11:33 +01:00
Conversation 8 Commits 15 Files Changed 6 +9 -9
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ef46aa7f7a - Show all commits

18
source/blender/editors/space_graph/graph_slider_ops.c
View File

@ -71,7 +71,7 @@ typedef struct tGraphSliderOp {
/* If an operator stores custom data, it also needs to provide the function to clean it up. */
void *operator_data;
void (*cleanup_operator_data)(void *operator_data);
void (*free_operator_data)(void *operator_data);
NumInput num;
} tGraphSliderOp;
@ -196,7 +196,7 @@ static void graph_slider_exit(bContext *C, wmOperator *op)
}
if (gso->operator_data) {
gso->cleanup_operator_data(gso->operator_data);
gso->free_operator_data(gso->operator_data);
Sybren A. Stüvel commented 2023-03-24 10:39:51 +01:00
Review
Copy Link

I think it's better to do a NULL check on gso->free_operator_data itself. Calling gso->free_operator_data(...) is guaranteed to crash if that pointer is NULL, whereas gso->free_operator_data(NULL) might be fine, depending on the implementation of that function.

It also simplifies the API, in that, regardless of any other field, the function is simply called when it's not-NULL.

I think it's better to do a `NULL` check on `gso->free_operator_data` itself. Calling `gso->free_operator_data(...)` is guaranteed to crash if that pointer is `NULL`, whereas `gso->free_operator_data(NULL)` might be fine, depending on the implementation of that function. It also simplifies the API, in that, regardless of any other field, the function is simply called when it's not-`NULL`.
}
ScrArea *area = gso->area;
@ -1077,9 +1077,9 @@ typedef struct tFCurveSegmentLink {
float *samples;
} tFCurveSegmentLink;
static void gauss_smooth_build_custom_data(tGraphSliderOp *gso,
const int filter_width,
const float sigma)
static void gauss_smooth_allocate_operator_data(tGraphSliderOp *gso,
const int filter_width,
const float sigma)
{
tGaussOperatorData *operator_data = MEM_callocN(sizeof(tGaussOperatorData),
"tGaussOperatorData");
@ -1116,7 +1116,7 @@ static void gauss_smooth_build_custom_data(tGraphSliderOp *gso,
gso->operator_data = operator_data;
}
static void gauss_smooth_free_custom_data(void *operator_data)
static void gauss_smooth_free_operator_data(void *operator_data)
{
tGaussOperatorData *gauss_data = (tGaussOperatorData *)operator_data;
LISTBASE_FOREACH (tFCurveSegmentLink *, segment_link, &gauss_data->segment_links) {
@ -1220,8 +1220,8 @@ static int gauss_smooth_invoke(bContext *C, wmOperator *op, const wmEvent *event
const float sigma = RNA_float_get(op->ptr, "sigma");
const int filter_width = RNA_int_get(op->ptr, "filter_width");
gauss_smooth_build_custom_data(gso, filter_width, sigma);
gso->cleanup_operator_data = gauss_smooth_free_custom_data;
gauss_smooth_allocate_operator_data(gso, filter_width, sigma);
gso->free_operator_data = gauss_smooth_free_operator_data;
ED_slider_allow_overshoot_set(gso->slider, false);
ease_draw_status_header(C, gso);
@ -1282,7 +1282,7 @@ void GRAPH_OT_gauss_smooth(wmOperatorType *ot)
0.001f,
FLT_MAX,
"Sigma",
"At which frquency the factor should be applied",
"The shape of the gauss distribution, lower values make it sharper",
0.001f,
100.0f);