Fixed merge
This commit is contained in:
commit
472174a206
@ -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…
x
Reference in New Issue
Block a user