diff options
| author | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2019-10-05 10:30:13 +0300 |
|---|---|---|
| committer | bruvzg <7645683+bruvzg@users.noreply.github.com> | 2020-02-11 12:03:39 +0100 |
| commit | 26318f3bd1b9fa9c7b7708cbef95b4cee56f1718 (patch) | |
| tree | 83b2ae5a23a17548f1c563074f5ab566b9a94eae /modules/assimp | |
| parent | fb739f9da78214e172334e39145b9e066541e220 (diff) | |
Fix Vector3 ambiguities and out of bounds init.
Diffstat (limited to 'modules/assimp')
| -rw-r--r-- | modules/assimp/editor_scene_importer_assimp.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/modules/assimp/editor_scene_importer_assimp.cpp b/modules/assimp/editor_scene_importer_assimp.cpp index 7a84a5329d..2e653f4c5d 100644 --- a/modules/assimp/editor_scene_importer_assimp.cpp +++ b/modules/assimp/editor_scene_importer_assimp.cpp @@ -167,8 +167,7 @@ struct EditorSceneImporterAssetImportInterpolate { float t2 = t * t; float t3 = t2 * t; - return 0.5f * ((2.0f * p1) + (-p0 + p2) * t + (2.0f * p0 - 5.0f * p1 + 4 * p2 - p3) * t2 + - (-p0 + 3.0f * p1 - 3.0f * p2 + p3) * t3); + return 0.5f * ((2.0f * p1) + (-p0 + p2) * t + (2.0f * p0 - 5.0f * p1 + 4.0f * p2 - p3) * t2 + (-p0 + 3.0f * p1 - 3.0f * p2 + p3) * t3); } T bezier(T start, T control_1, T control_2, T end, float t) { |