diff options
| author | Campbell Barton <campbell@blender.org> | 2022-08-17 14:33:46 +0300 |
|---|---|---|
| committer | Campbell Barton <campbell@blender.org> | 2022-08-17 14:34:13 +0300 |
| commit | 517d622057c4c362114b5ae32d4da7d653043038 (patch) | |
| tree | d5867e57b95db05b988190489d6e861021d23322 | |
| parent | 6ab5bced6114c566313131467f75f97be4428156 (diff) | |
Cleanup: conversion warnings in GCC
| -rw-r--r-- | source/blender/editors/interface/interface_ops.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_ops.cc b/source/blender/editors/interface/interface_ops.cc index 27ae7fd9473..d7a1a786ef5 100644 --- a/source/blender/editors/interface/interface_ops.cc +++ b/source/blender/editors/interface/interface_ops.cc @@ -769,7 +769,7 @@ static void override_idtemplate_ids_get( *r_owner_id = owner_ptr.owner_id; PointerRNA idptr = RNA_property_pointer_get(&owner_ptr, prop); - *r_id = idptr.data; + *r_id = static_cast<ID *>(idptr.data); if (r_owner_ptr != NULL) { *r_owner_ptr = owner_ptr; } @@ -982,7 +982,7 @@ static void override_idtemplate_menu(void) { MenuType *mt; - mt = MEM_callocN(sizeof(MenuType), __func__); + mt = MEM_cnew<MenuType>(__func__); strcpy(mt->idname, "UI_MT_idtemplate_liboverride"); strcpy(mt->label, N_("Library Override")); mt->poll = override_idtemplate_menu_poll; |