From 3790caafa3c98706c5cf0618c8aec592b2780bba Mon Sep 17 00:00:00 2001 From: John Firebaugh Date: Wed, 3 May 2017 10:13:01 -0700 Subject: [core] Factor timePoint initialization --- src/mbgl/style/style.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mbgl/style') diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index a3c7ce1ad1..7f21d81b0e 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -360,7 +360,7 @@ void Style::cascade(const TimePoint& timePoint, MapMode mode) { const CascadeParameters parameters { classIDs, - mode == MapMode::Continuous ? timePoint : Clock::time_point::max(), + timePoint, mode == MapMode::Continuous ? transitionOptions : immediateTransition }; @@ -382,7 +382,7 @@ void Style::recalculate(float z, const TimePoint& timePoint, MapMode mode) { const PropertyEvaluationParameters parameters { z, - mode == MapMode::Continuous ? timePoint : Clock::time_point::max(), + timePoint, zoomHistory, mode == MapMode::Continuous ? util::DEFAULT_FADE_DURATION : Duration::zero() }; -- cgit v1.2.1