Fixed merge

master
Christophe Riccio ago%!(EXTRA string=14 years)
commit 472174a206
  1. 2
      glm/core/func_common.inl

@ -239,7 +239,7 @@ namespace detail
if(x < 0) if(x < 0)
return genType(int(x - genType(0.5))); return genType(int(x - genType(0.5)));
return genType(int(x + genType(0.5))); return genType(int(x + genType(0.5)));
} }
template <typename valType> template <typename valType>

Loading…
Cancel
Save