[Bf-blender-cvs] [517d622057c] master: Cleanup: conversion warnings in GCC
Campbell Barton
noreply at git.blender.org
Wed Aug 17 13:34:31 CEST 2022
Commit: 517d622057c4c362114b5ae32d4da7d653043038
Author: Campbell Barton
Date: Wed Aug 17 21:33:46 2022 +1000
Branches: master
https://developer.blender.org/rB517d622057c4c362114b5ae32d4da7d653043038
Cleanup: conversion warnings in GCC
===================================================================
M source/blender/editors/interface/interface_ops.cc
===================================================================
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;
More information about the Bf-blender-cvs
mailing list