Merge branch 'master' into blender2.8

3 files changed, 6 insertions, 6 deletions

diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index edb0928c57e..546b646deb5 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -2409,7 +2409,7 @@ static bool ui_set_but_string_eval_num_unit(bContext *C, uiBut *but, const char
 	        str_unit_convert, sizeof(str_unit_convert), but->drawstr,
 	        ui_get_but_scale_unit(but, 1.0), but->block->unit->system, RNA_SUBTYPE_UNIT_VALUE(unit_type));
 
-	return BPY_execute_string_as_number(C, str_unit_convert, true, r_value);
+	return BPY_execute_string_as_number(C, NULL, str_unit_convert, true, r_value);
 }
 
 #endif /* WITH_PYTHON */
@@ -2424,7 +2424,7 @@ bool ui_but_string_set_eval_num(bContext *C, uiBut *but, const char *str, double
 	if (str[0] != '\0') {
 		bool is_unit_but = (ui_but_is_float(but) && ui_but_is_unit(but));
 		/* only enable verbose if we won't run again with units */
-		if (BPY_execute_string_as_number(C, str, is_unit_but == false, r_value)) {
+		if (BPY_execute_string_as_number(C, NULL, str, is_unit_but == false, r_value)) {
 			/* if the value parsed ok without unit conversion this button may still need a unit multiplier */
 			if (is_unit_but) {
 				char str_new[128];
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(
diff --git a/source/blender/editors/util/numinput.c b/source/blender/editors/util/numinput.c
index f64182d2ad6..98e7e5ba897 100644
--- a/source/blender/editors/util/numinput.c
+++ b/source/blender/editors/util/numinput.c
@@ -539,7 +539,7 @@ bool handleNumInput(bContext *C, NumInput *n, const wmEvent *event)
 		                    n->unit_sys, n->unit_type[idx]);
 
 		/* Note: with angles, we always get values as radians here... */
-		if (BPY_execute_string_as_number(C, str_unit_convert, false, &val)) {
+		if (BPY_execute_string_as_number(C, NULL, str_unit_convert, false, &val)) {
 			n->val[idx] = (float)val;
 			n->val_flag[idx] &= ~NUM_INVALID;
 		}