Merge pull request #5130 from Citadel-Station-13/upstream-merge-34952

[MIRROR] Left out a closing parenthesis in LERP
2018-01-27 14:18:06 -06:00
parent 434449724e b7e6927bbe
commit 9f9d3e4312
1 changed files with 1 additions and 1 deletions
@@ -86,7 +86,7 @@
 // Performs a linear interpolation between a and b.
 // Note that amount=0 returns a, amount=1 returns b, and
 // amount=0.5 returns the mean of a and b.
-#define LERP(a, b, amount) (amount ? ((a) + ((b) - (a)) * (amount)) : ((a) + ((b) - (a)) * 0.5)
+#define LERP(a, b, amount) ( amount ? ((a) + ((b) - (a)) * (amount)) : a )

 // Returns the nth root of x.
 #define ROOT(n, x) ((x) ** (1 / (n)))