From 315bb1199f329183e2fee48bcaf9e4ee08b629c6 Mon Sep 17 00:00:00 2001 From: Ovahlord Date: Sat, 26 Oct 2019 02:14:32 +0200 Subject: [PATCH] Dep/Recast: restored a change that got lost during merging 3.3.5 changes --- .../Recast/Source/RecastRasterization.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dep/recastnavigation/Recast/Source/RecastRasterization.cpp b/dep/recastnavigation/Recast/Source/RecastRasterization.cpp index a4cef749098..57c6fcdf227 100644 --- a/dep/recastnavigation/Recast/Source/RecastRasterization.cpp +++ b/dep/recastnavigation/Recast/Source/RecastRasterization.cpp @@ -122,16 +122,16 @@ static bool addSpan(rcHeightfield& hf, const int x, const int y, } else { + // Merge flags. + if (rcAbs((int)s->smax - (int)cur->smax) <= flagMergeThr) + s->area = rcMax(s->area, cur->area); + // Merge spans. if (cur->smin < s->smin) s->smin = cur->smin; if (cur->smax > s->smax) s->smax = cur->smax; - - // Merge flags. - if (rcAbs((int)s->smax - (int)cur->smax) <= flagMergeThr) - s->area = rcMax(s->area, cur->area); - + // Remove current span. rcSpan* next = cur->next; freeSpan(hf, cur);