Merge branch 'master' into blender2.8

2017-06-26 13:43:56 +10:00
parent fb96228441 0172ed8fe5
commit 6d1ae5897f
6 changed files with 9 additions and 11 deletions
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -2333,11 +2333,10 @@ bool ui_but_string_set_eval_num(bContext *C, uiBut *but, const char *str, double

 #else /* WITH_PYTHON */

-	*value = atof(str);
+	*r_value = atof(str);
 	ok = true;

-	(void)C;
-	(void)but;
+	UNUSED_VARS(C, but);

 #endif /* WITH_PYTHON */