[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [54808] trunk/blender/source/blender/ editors/interface/interface.c: Fix for uiButGetStrInfo: We need a string value here, return BPY_I18NCONTEXT_DEFAULT_BPY when using default NULL label's context .
Bastien Montagne
montagne29 at wanadoo.fr
Sun Feb 24 09:46:01 CET 2013
Revision: 54808
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=54808
Author: mont29
Date: 2013-02-24 08:46:01 +0000 (Sun, 24 Feb 2013)
Log Message:
-----------
Fix for uiButGetStrInfo: We need a string value here, return BPY_I18NCONTEXT_DEFAULT_BPY when using default NULL label's context.
Modified Paths:
--------------
trunk/blender/source/blender/editors/interface/interface.c
Modified: trunk/blender/source/blender/editors/interface/interface.c
===================================================================
--- trunk/blender/source/blender/editors/interface/interface.c 2013-02-24 07:09:39 UTC (rev 54807)
+++ trunk/blender/source/blender/editors/interface/interface.c 2013-02-24 08:46:01 UTC (rev 54808)
@@ -3929,15 +3929,20 @@
}
}
else if (type == BUT_GET_RNA_LABEL_CONTEXT) {
+ const char *_tmp = NULL;
if (but->rnaprop)
- tmp = BLI_strdup(RNA_property_translation_context(but->rnaprop));
+ _tmp = RNA_property_translation_context(but->rnaprop);
else if (but->optype)
- tmp = BLI_strdup(RNA_struct_translation_context(but->optype->srna));
+ _tmp = RNA_struct_translation_context(but->optype->srna);
else if (ELEM(but->type, MENU, PULLDOWN)) {
MenuType *mt = uiButGetMenuType(but);
if (mt)
- tmp = BLI_strdup(RNA_struct_translation_context(mt->ext.srna));
+ _tmp = RNA_struct_translation_context(mt->ext.srna);
}
+ if (!_tmp) { /* _tmp == BLF_I18NCONTEXT_DEFAULT */
+ _tmp = BLF_I18NCONTEXT_DEFAULT_BPY;
+ }
+ tmp = BLI_strdup(_tmp);
}
else if (ELEM3(type, BUT_GET_RNAENUM_IDENTIFIER, BUT_GET_RNAENUM_LABEL, BUT_GET_RNAENUM_TIP)) {
PointerRNA *ptr = NULL;
More information about the Bf-blender-cvs
mailing list