Merge pull request #281 from Hixie/buttons

Fix the crash for buttons.

Merge pull request #281 from Hixie/buttons
Fix the crash for buttons.
4f9f5656 · Ian Hickson · df7fdb5b · be5545cf · 4f9f5656
Commit 4f9f5656 authored Jul 25, 2015 by Ian Hickson
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

lerp.dart packages/flutter/lib/base/lerp.dart +1 -1

No files found.
--- a/packages/flutter/lib/base/lerp.dart
+++ b/packages/flutter/lib/base/lerp.dart
@@ -22,7 +22,7 @@ Color lerpColor(Color a, Color b, double t) {
  if (a == null && b == null)
    return null;
  if (a == null)
-    return _scaleAlpha(b, t);
+    return _scaleAlpha(a, t);
  if (b == null)
    return _scaleAlpha(b, 1.0 - t);
  return new Color.fromARGB(