Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulian Eisel <eiseljulian@gmail.com>2016-09-19 03:25:59 +0300
committerJulian Eisel <eiseljulian@gmail.com>2016-09-19 03:41:10 +0300
commitc2d7d4764e86d8a133168ff8ea9aedbd78b5cd72 (patch)
tree421fef350fcdcbb8f0bc25f26390951cc9ee2121 /source/blender/editors/interface/interface_layout.c
parent976e591e93dd97de2c8f5be639a78c22e6505bae (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_layout.c')
-rw-r--r--source/blender/editors/interface/interface_layout.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/editors/interface/interface_layout.c b/source/blender/editors/interface/interface_layout.c
index 672bd74745d..976b5ed1193 100644
--- a/source/blender/editors/interface/interface_layout.c
+++ b/source/blender/editors/interface/interface_layout.c
@@ -745,7 +745,7 @@ static void ui_item_disabled(uiLayout *layout, const char *name)
but = uiDefBut(block, UI_BTYPE_LABEL, 0, name, 0, 0, w, UI_UNIT_Y, NULL, 0.0, 0.0, 0, 0, "");
but->flag |= UI_BUT_DISABLED;
- but->lockstr = "";
+ but->disabled_info = "";
}
/* operator items */