Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/blender/editors/interface/interface_template_list.cc')
-rw-r--r--source/blender/editors/interface/interface_template_list.cc10
1 files changed, 7 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_template_list.cc b/source/blender/editors/interface/interface_template_list.cc
index eaab33e32c9..0ab45ea0f81 100644
--- a/source/blender/editors/interface/interface_template_list.cc
+++ b/source/blender/editors/interface/interface_template_list.cc
@@ -1170,7 +1170,7 @@ uiList *uiTemplateList_ex(uiLayout *layout,
enum uiTemplateListFlags flags,
void *customdata)
{
- TemplateListInputData input_data = {nullptr};
+ TemplateListInputData input_data = {{nullptr}};
uiListType *ui_list_type;
if (!ui_template_list_data_retrieve(listtype_name,
list_id,
@@ -1271,7 +1271,9 @@ PointerRNA *UI_list_custom_activate_operator_set(uiList *ui_list,
}
if (create_properties) {
- WM_operator_properties_alloc(&dyn_data->custom_activate_opptr, nullptr, opname);
+ PointerRNA *opptr = dyn_data->custom_activate_opptr;
+ WM_operator_properties_alloc(
+ &dyn_data->custom_activate_opptr, opptr ? (IDProperty **)&opptr->data : nullptr, opname);
}
return dyn_data->custom_activate_opptr;
@@ -1291,7 +1293,9 @@ PointerRNA *UI_list_custom_drag_operator_set(uiList *ui_list,
}
if (create_properties) {
- WM_operator_properties_alloc(&dyn_data->custom_drag_opptr, nullptr, opname);
+ PointerRNA *opptr = dyn_data->custom_drag_opptr;
+ WM_operator_properties_alloc(
+ &dyn_data->custom_drag_opptr, opptr ? (IDProperty **)&opptr->data : nullptr, opname);
}
return dyn_data->custom_drag_opptr;