diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2014-02-15 04:35:40 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2014-02-15 04:37:33 +0400 |
| commit | 01d9bbaa5ef914b779bc00decd85f9336340db26 (patch) | |
| tree | 77ec465e50170a1548c2ec34c8f4e710114ff0aa /source/blender/editors | |
| parent | 67ba7e50d4547957c9df1656fe9ba3b5ca96b0ab (diff) | |
Code cleanup: remove more string encoded menu functions
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/armature/editarmature_sketch.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/include/ED_armature.h | 1 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface.c | 17 |
3 files changed, 5 insertions, 15 deletions
diff --git a/source/blender/editors/armature/editarmature_sketch.c b/source/blender/editors/armature/editarmature_sketch.c index f421cd1b7fb..a1ba76c3c08 100644 --- a/source/blender/editors/armature/editarmature_sketch.c +++ b/source/blender/editors/armature/editarmature_sketch.c @@ -165,6 +165,7 @@ void BIF_makeListTemplates(const bContext *C) } } +#if 0 /* UNUSED */ const char *BIF_listTemplates(const bContext *UNUSED(C)) { GHashIterator ghi; @@ -194,6 +195,7 @@ const char *BIF_listTemplates(const bContext *UNUSED(C)) return TEMPLATES_MENU; } +#endif int BIF_currentTemplate(const bContext *C) { diff --git a/source/blender/editors/include/ED_armature.h b/source/blender/editors/include/ED_armature.h index 61fcdc86d58..dea4b2448ff 100644 --- a/source/blender/editors/include/ED_armature.h +++ b/source/blender/editors/include/ED_armature.h @@ -187,7 +187,6 @@ void BIF_deleteSketch(struct bContext *C); void BIF_selectAllSketch(struct bContext *C, int mode); /* -1: deselect, 0: select, 1: toggle */ void BIF_makeListTemplates(const struct bContext *C); -const char *BIF_listTemplates(const struct bContext *C); int BIF_currentTemplate(const struct bContext *C); void BIF_freeTemplates(struct bContext *C); void BIF_setTemplate(struct bContext *C, int index); diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 64b25fe11d7..68dd50f54ca 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -4168,22 +4168,11 @@ void uiButGetStrInfo(bContext *C, uiBut *but, ...) if (type == BUT_GET_LABEL) { if (but->str) { - /* Menu labels can have some complex formating stuff marked by pipes or %t, we don't want those here! */ - const char *tc1, *tc2; - - tc1 = strstr(but->str, "%t"); - tc2 = strstr(but->str, UI_SEP_CHAR_S); - - if (tc2 && (!tc1 || tc1 > tc2)) - tc1 = tc2; - - if (tc1) - tmp = BLI_strdupn(but->str, tc1 - but->str); - else - tmp = BLI_strdup(but->str); + tmp = BLI_strdup(but->str); } - else + else { type = BUT_GET_RNA_LABEL; /* Fail-safe solution... */ + } } else if (type == BUT_GET_TIP) { if (but->tip && but->tip[0]) |