[Bf-blender-cvs] [52b2901156c] soc-2020-custom-menus: Fix RNA_def_property_enum_funcs use, const cast warning

Campbell Barton noreply at git.blender.org
Sat Jun 20 08:57:45 CEST 2020


Commit: 52b2901156c4e157314f75c833e6cbc5210e43ac
Author: Campbell Barton
Date:   Sat Jun 20 16:56:20 2020 +1000
Branches: soc-2020-custom-menus
https://developer.blender.org/rB52b2901156c4e157314f75c833e6cbc5210e43ac

Fix RNA_def_property_enum_funcs use, const cast warning

===================================================================

M	source/blender/editors/screen/screen_user_menu.c
M	source/blender/makesrna/intern/rna_userdef.c

===================================================================

diff --git a/source/blender/editors/screen/screen_user_menu.c b/source/blender/editors/screen/screen_user_menu.c
index e43b8569f82..434cd6cb1f0 100644
--- a/source/blender/editors/screen/screen_user_menu.c
+++ b/source/blender/editors/screen/screen_user_menu.c
@@ -225,7 +225,7 @@ void ED_screen_user_menu_item_add_prop(bContext *C,
 
      }
      if (prop) {
-      char *name = RNA_property_ui_name(prop);
+      const char *name = RNA_property_ui_name(prop);
       BLI_strncpy(umi_pr->item.ui_name, name, FILE_MAX);
     }
 
diff --git a/source/blender/makesrna/intern/rna_userdef.c b/source/blender/makesrna/intern/rna_userdef.c
index b7740e5e476..2d88e0bbebd 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -6286,7 +6286,7 @@ static void rna_def_userdef_user_menus(BlenderRNA *brna)
   RNA_def_property_enum_items(prop, um_items_null);
   RNA_def_property_ui_text(
       prop, "item selected", "the item selected");
-  RNA_def_property_enum_funcs_runtime(prop, NULL, NULL, "rna_UserDef_usermenus_items_itemf");
+  RNA_def_property_enum_funcs(prop, NULL, NULL, "rna_UserDef_usermenus_items_itemf");
 
   //item properties
   prop = RNA_def_property(srna, "item_name", PROP_STRING, PROP_NONE);



More information about the Bf-blender-cvs mailing list