diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2017-06-21 16:14:42 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2017-06-21 16:14:42 +0300 |
| commit | 4ceb006706579a0ad2301d2cde57489b69a7683c (patch) | |
| tree | 3825806212dd3d3e5f8a44a16b9b82cfe8142c81 /source/blender/editors/interface/interface.c | |
| parent | 2ae172ec32da4a1aacd268bdba45bf82cff7eea9 (diff) | |
| parent | 22466a5bdff73afb6ad3afd408e265517e4f3733 (diff) | |
Merge remote-tracking branch 'origin/master' into blender2.8
Diffstat (limited to 'source/blender/editors/interface/interface.c')
| -rw-r--r-- | source/blender/editors/interface/interface.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index be37ba46f7f..d667a26cc89 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -3179,7 +3179,9 @@ static uiBut *ui_def_but( } if (block->flag & UI_BLOCK_RADIAL) { - but->drawflag |= (UI_BUT_TEXT_LEFT | UI_BUT_ICON_LEFT); + but->drawflag |= UI_BUT_TEXT_LEFT; + if (but->str && but->str[0]) + but->drawflag |= UI_BUT_ICON_LEFT; } else if ((block->flag & UI_BLOCK_LOOP) || ELEM(but->type, |