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

Merge branch 'blender-v4.4-release'

Browse Source
This commit is contained in:
Bastien Montagne
2025-02-12 14:42:37 +01:00
parent 33d34e2a05 5a8f0bbc03
commit 8234484904
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/editors/curve/editfont.cc
View File

@@ -2417,14 +2417,13 @@ static void font_ui_template_init(bContext *C, wmOperator *op)
{
PropertyPointerRNA *pprop;
op->customdata = pprop = static_cast<PropertyPointerRNA *>(
MEM_callocN(sizeof(PropertyPointerRNA), "OpenPropertyPointerRNA"));
op->customdata = pprop = MEM_new<PropertyPointerRNA>("OpenPropertyPointerRNA");
UI_context_active_but_prop_get_templateID(C, &pprop->ptr, &pprop->prop);
}
static void font_open_cancel(bContext * /*C*/, wmOperator *op)
{
MEM_freeN(op->customdata);
MEM_delete(static_cast<PropertyPointerRNA *>(op->customdata));
op->customdata = nullptr;
}
@@ -2462,7 +2461,7 @@ static int font_open_exec(bContext *C, wmOperator *op)
RNA_property_update(C, &pprop->ptr, pprop->prop);
}
MEM_freeN(op->customdata);
MEM_delete(static_cast<PropertyPointerRNA *>(op->customdata));
return OPERATOR_FINISHED;
}

2
source/blender/editors/sound/sound_ops.cc
View File

@@ -57,7 +57,7 @@
static void sound_open_cancel(bContext * /*C*/, wmOperator *op)
{
MEM_freeN(op->customdata);
MEM_delete(static_cast<PropertyPointerRNA *>(op->customdata));
op->customdata = nullptr;
}

2
source/blender/editors/space_text/text_ops.cc
View File

@@ -395,7 +395,7 @@ static void text_open_init(bContext *C, wmOperator *op)
static void text_open_cancel(bContext * /*C*/, wmOperator *op)
{
MEM_freeN(op->customdata);
MEM_delete(static_cast<PropertyPointerRNA *>(op->customdata));
}
static int text_open_exec(bContext *C, wmOperator *op)