From c26cc0afa1bde9c388eab27be6cbc3efed7fb399 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sun, 19 Dec 2010 07:05:29 +0000 Subject: bugfix [#25290] Align on text gives a traceback [#25284] Traceback error on "System Info" script - Align was only working on mesh objects, now operate on all objects, missing boundbox's are treated as single points. - obj.bound_box was returning all nan's for object types with no boundbox. - ENUM_FLAG type enums were showing no text when displayed in operator redo panel. --- source/blender/editors/interface/interface_utils.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'source/blender/editors/interface/interface_utils.c') diff --git a/source/blender/editors/interface/interface_utils.c b/source/blender/editors/interface/interface_utils.c index b6afe6f63d4..b42b5aff33e 100644 --- a/source/blender/editors/interface/interface_utils.c +++ b/source/blender/editors/interface/interface_utils.c @@ -163,7 +163,14 @@ int uiDefAutoButsRNA(uiLayout *layout, PointerRNA *ptr, int (*check_prop)(Proper col= NULL; } - name= ""; /* name is shown above, empty name for button below */ + /* may meed to add more cases here. + * don't override enum flag names */ + if(flag & PROP_ENUM_FLAG) { + name= NULL; + } + else { + name= ""; /* name is shown above, empty name for button below */ + } } else { col= layout; -- cgit v1.2.3