[Bf-blender-cvs] [0172ed8fe55] master: Building w/o Python works again

Campbell Barton noreply at git.blender.org
Mon Jun 26 05:20:56 CEST 2017


Commit: 0172ed8fe55b402b95be51f4d876da9794b2ac55
Author: Campbell Barton
Date:   Mon Jun 26 13:25:51 2017 +1000
Branches: master
https://developer.blender.org/rB0172ed8fe55b402b95be51f4d876da9794b2ac55

Building w/o Python works again

===================================================================

M	source/blender/blenkernel/intern/fcurve.c
M	source/blender/editors/interface/interface.c

===================================================================

diff --git a/source/blender/blenkernel/intern/fcurve.c b/source/blender/blenkernel/intern/fcurve.c
index 97d15ffc074..db6c533ab57 100644
--- a/source/blender/blenkernel/intern/fcurve.c
+++ b/source/blender/blenkernel/intern/fcurve.c
@@ -1945,7 +1945,7 @@ float evaluate_driver(PathResolvedRNA *anim_rna, ChannelDriver *driver, const fl
 				BLI_mutex_unlock(&python_driver_lock);
 			}
 #else /* WITH_PYTHON*/
-			(void)evaltime;
+			UNUSED_VARS(anim_rna, evaltime);
 #endif /* WITH_PYTHON*/
 			break;
 		}
diff --git a/source/blender/editors/interface/interface.c b/source/blender/editors/interface/interface.c
index 2ebdf6d214e..bcb1e3e648a 100644
--- a/source/blender/editors/interface/interface.c
+++ b/source/blender/editors/interface/interface.c
@@ -2335,11 +2335,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 */




More information about the Bf-blender-cvs mailing list