diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2016-09-19 03:25:59 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2016-09-19 03:41:10 +0300 |
| commit | c2d7d4764e86d8a133168ff8ea9aedbd78b5cd72 (patch) | |
| tree | 421fef350fcdcbb8f0bc25f26390951cc9ee2121 /source/blender/editors/interface/interface_regions.c | |
| parent | 976e591e93dd97de2c8f5be639a78c22e6505bae (diff) | |
Various cleanups related to button locking
* Rename uiBut.lockstr to disabled_info
* Remove unreachable code
* Replace duplicated check with assert
* Replace overly ambitious check with assert
* Add comments
Diffstat (limited to 'source/blender/editors/interface/interface_regions.c')
| -rw-r--r-- | source/blender/editors/interface/interface_regions.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/editors/interface/interface_regions.c b/source/blender/editors/interface/interface_regions.c index 8073fb3552f..b7f921624d9 100644 --- a/source/blender/editors/interface/interface_regions.c +++ b/source/blender/editors/interface/interface_regions.c @@ -466,8 +466,8 @@ static uiTooltipData *ui_tooltip_data_from_button(bContext *C, uiBut *but) disabled_msg = CTX_wm_operator_poll_msg_get(C); } /* alternatively, buttons can store some reasoning too */ - else if (but->lockstr) { - disabled_msg = but->lockstr; + else if (but->disabled_info) { + disabled_msg = but->disabled_info; } if (disabled_msg && disabled_msg[0]) { |