diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2010-12-19 10:05:29 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2010-12-19 10:05:29 +0300 |
| commit | c26cc0afa1bde9c388eab27be6cbc3efed7fb399 (patch) | |
| tree | 1ebc8f25fc54c4bdf5d30ee84f7f8034469d982a /source/blender/editors/interface/interface_utils.c | |
| parent | 096369e89d1f036864e01a0e48d745b0d056748a (diff) | |
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.
Diffstat (limited to 'source/blender/editors/interface/interface_utils.c')
| -rw-r--r-- | source/blender/editors/interface/interface_utils.c | 9 |
1 files changed, 8 insertions, 1 deletions
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; |