diff options
| author | Julian Eisel <eiseljulian@gmail.com> | 2018-05-25 15:01:25 +0300 |
|---|---|---|
| committer | Julian Eisel <eiseljulian@gmail.com> | 2018-05-25 15:04:48 +0300 |
| commit | dc26ef081b98f0c475ccf79935360cf9986e2a02 (patch) | |
| tree | 903c4c7c8e13f13ed632be6de278709e19e7c6bf /source/blender/editors/interface/interface.c | |
| parent | 45e7d609cebc6bd062932bb06c3b45a75e1ca4af (diff) | |
Fix T55198: Preferences Keybindings Crash
Operator sanitize function would be called for non operator props. Mistake from
88eafe078a5b5111c.
Diffstat (limited to 'source/blender/editors/interface/interface.c')
| -rw-r--r-- | source/blender/editors/interface/interface.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c index 683db8985c9..de1c1de4bcf 100644 --- a/source/blender/editors/interface/interface.c +++ b/source/blender/editors/interface/interface.c @@ -4626,6 +4626,9 @@ void UI_but_string_info_get(bContext *C, uiBut *but, ...) PointerRNA *opptr = UI_but_operator_ptr_get(but); wmOperatorType *ot = but->optype; + /* so the context is passed to itemf functions */ + WM_operator_properties_sanitize(opptr, false); + /* if the default property of the operator is enum and it is set, * fetch the tooltip of the selected value so that "Snap" and "Mirror" * operator menus in the Anim Editors will show tooltips for the different @@ -4645,9 +4648,6 @@ void UI_but_string_info_get(bContext *C, uiBut *but, ...) if (!item) { int i; - /* so the context is passed to itemf functions */ - WM_operator_properties_sanitize(ptr, false); - RNA_property_enum_items_gettexted(C, ptr, prop, &items, &totitems, &free_items); for (i = 0, item = items; i < totitems; i++, item++) { if (item->identifier[0] && item->value == value) |