Fixed failed merging of master.

This commit is contained in:
Jonathas Costa
2019-07-31 15:05:52 -04:00
61 changed files with 21213 additions and 7434 deletions

View File

@@ -233,7 +233,7 @@ void RenderableTrailOrbit::update(const UpdateData& data) {
// Write the current location into the floating position
const glm::vec3 p = _translation->position({
{},
data.time.now(),
data.time,
Time(0.0),
false
});