[Bf-blender-cvs] [b53f310] master: Quiet warning
Campbell Barton
noreply at git.blender.org
Fri Feb 7 00:27:02 CET 2014
Commit: b53f310be8c1faf53e51b875eb3ca790c5efeee2
Author: Campbell Barton
Date: Fri Feb 7 07:39:44 2014 +1100
https://developer.blender.org/rBb53f310be8c1faf53e51b875eb3ca790c5efeee2
Quiet warning
===================================================================
M source/blender/blenkernel/BKE_screen.h
M source/blender/makesrna/intern/rna_ui.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_screen.h b/source/blender/blenkernel/BKE_screen.h
index 2aaf919..4cbd7e9 100644
--- a/source/blender/blenkernel/BKE_screen.h
+++ b/source/blender/blenkernel/BKE_screen.h
@@ -242,7 +242,7 @@ typedef struct MenuType {
char idname[BKE_ST_MAXNAME]; /* unique name */
char label[BKE_ST_MAXNAME]; /* for button text */
char translation_context[BKE_ST_MAXNAME];
- char *description;
+ const char *description;
/* verify if the menu should draw or not */
int (*poll)(const struct bContext *, struct MenuType *);
diff --git a/source/blender/makesrna/intern/rna_ui.c b/source/blender/makesrna/intern/rna_ui.c
index c812fa0..6559c27 100644
--- a/source/blender/makesrna/intern/rna_ui.c
+++ b/source/blender/makesrna/intern/rna_ui.c
@@ -686,10 +686,11 @@ static StructRNA *rna_Menu_register(Main *bmain, ReportList *reports, void *data
int have_function[2];
size_t over_alloc = 0; /* warning, if this becomes a bess, we better do another alloc */
size_t description_size = 0;
- char _menu_descr[RNA_DYN_DESCR_MAX] = {0};
+ char _menu_descr[RNA_DYN_DESCR_MAX];
/* setup dummy menu & menu type to store static properties in */
dummymenu.type = &dummymt;
+ _menu_descr[0] = '\0';
dummymenu.type->description = _menu_descr;
RNA_pointer_create(NULL, &RNA_Menu, &dummymenu, &dummymtr);
More information about the Bf-blender-cvs
mailing list