diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-09-03 05:48:30 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-09-03 05:48:51 +0300 |
| commit | 88a893a83876bd983291881dbea8855600610e2b (patch) | |
| tree | d47af71eb1069f6e3e870f54ca5312af2536deb5 /source/blender/editors/interface/interface_region_tooltip.c | |
| parent | 0c389862c4fff3fb9eca9027e300774ce1c3eb7e (diff) | |
| parent | 7ff1750218bf3c2ef4c57f9ea4a12b738f4b7264 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/editors/interface/interface_region_tooltip.c')
| -rw-r--r-- | source/blender/editors/interface/interface_region_tooltip.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/editors/interface/interface_region_tooltip.c b/source/blender/editors/interface/interface_region_tooltip.c index 89edba9f35a..bc6ddc73fb6 100644 --- a/source/blender/editors/interface/interface_region_tooltip.c +++ b/source/blender/editors/interface/interface_region_tooltip.c @@ -400,7 +400,7 @@ static uiTooltipData *ui_tooltip_data_from_tool(bContext *C, uiBut *but) tool_name); char *expr_result = NULL; - if (BPY_execute_string_as_string(C, expr, true, &expr_result)) { + if (BPY_execute_string_as_string(C, NULL, expr, true, &expr_result)) { if (!STREQ(expr_result, ".")) { uiTooltipField *field = text_field_add( data, &(uiTooltipFormat){ @@ -452,7 +452,7 @@ static uiTooltipData *ui_tooltip_data_from_tool(bContext *C, uiBut *but) "'as_pointer', lambda: 0)()"); intptr_t expr_result = 0; - if (BPY_execute_string_as_intptr(C, expr_ptr, true, &expr_result)) { + if (BPY_execute_string_as_intptr(C, NULL, expr_ptr, true, &expr_result)) { if (expr_result != 0) { wmKeyMap *keymap = (wmKeyMap *)expr_result; for (wmKeyMapItem *kmi = keymap->items.first; kmi; kmi = kmi->next) { @@ -503,7 +503,7 @@ static uiTooltipData *ui_tooltip_data_from_tool(bContext *C, uiBut *but) tool_name); intptr_t expr_result = 0; - if (BPY_execute_string_as_intptr(C, expr, true, &expr_result)) { + if (BPY_execute_string_as_intptr(C, NULL, expr, true, &expr_result)) { if (expr_result != 0) { { uiTooltipField *field = text_field_add( |