Commit: 79d256a06da0a6aad0ff9208f05cf58c88b4331b
Author: TempoDev
Date: Sun Aug 16 20:06:19 2020 +0200
Branches: soc-2020-custom-menus
https://developer.blender.org/rB79d256a06da0a6aad0ff9208f05cf58c88b4331b
Custom Menus : clean code
===================================================================
M source/blender/blenkernel/intern/blender_user_menu.c
M source/blender/makesdna/DNA_userdef_types.h
M source/blender/makesrna/intern/rna_userdef.c
M source/tools
===================================================================
diff --git a/source/blender/blenkernel/intern/blender_user_menu.c
b/source/blender/blenkernel/intern/blender_user_menu.c
index b629696f2c6..c70bc5e47e4 100644
--- a/source/blender/blenkernel/intern/blender_user_menu.c
+++ b/source/blender/blenkernel/intern/blender_user_menu.c
@@ -94,7 +94,6 @@ void
BKE_blender_user_menus_group_idname_update_keymap(wmWindowManager *wm,
if (STREQ(kmi->idname, "WM_OT_call_user_menu")) {
IDProperty *idp = IDP_GetPropertyFromGroup(kmi->properties, "name");
char *index = IDP_String(idp);
- printf("%s\n", index);
}
}
}
diff --git a/source/blender/makesdna/DNA_userdef_types.h
b/source/blender/makesdna/DNA_userdef_types.h
index 1d2f96de3a1..99d2c4565db 100644
--- a/source/blender/makesdna/DNA_userdef_types.h
+++ b/source/blender/makesdna/DNA_userdef_types.h
@@ -520,11 +520,11 @@ typedef struct bPathCompare {
typedef struct bUserMenusGroup {
struct bUserMenusGroup *next, *prev;
/* bUserMenu */
- struct ListBase menus;
- char type;
char idname[64];
char name[64];
+ char type;
char _pad0[7];
+ struct ListBase menus;
} bUserMenusGroup;
typedef struct bUserMenu {
diff --git a/source/blender/makesrna/intern/rna_userdef.c
b/source/blender/makesrna/intern/rna_userdef.c
index 1728af42008..16f4a49328c 100644
--- a/source/blender/makesrna/intern/rna_userdef.c
+++ b/source/blender/makesrna/intern/rna_userdef.c
@@ -1548,7 +1548,6 @@ static void rna_UserDef_usermenus_group_idname_set(Main
*bmain,
STRNCPY(old, umg->idname);
BKE_blender_user_menus_group_idname_update(umg);
BKE_blender_user_menus_group_idname_update_keymap(bmain->wm.first, old,
umg->idname);
- printf("%s\n", umg->idname);
}
static void rna_UserDef_usermenus_item_op_get(PointerRNA *ptr, char *value)
diff --git a/source/tools b/source/tools
index 6a252de776d..5cf2fc3e5dc 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit 6a252de776d0b9dca3167c30a7621a4f1e9bc911
+Subproject commit 5cf2fc3e5dc28025394b57d8743401295528f310
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs