summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2021-07-30 09:34:30 +0200
committerGitHub <noreply@github.com>2021-07-30 09:34:30 +0200
commit7ab3e8aa20a075b1090314bfae057e0d6307e325 (patch)
treefc9c31bb20f888e6bc335d3f77ea5a99343a11d3
parent74aa7e26e9eca919358fddb1c6ab811d3d244816 (diff)
parent882f7d9bdf0e26cc6e09a7d7b0c699a318baa1c1 (diff)
Merge pull request #51051 from V-Sekai/gltf-less-logs
In glTF2 animations, log spam less when running.
-rw-r--r--modules/gltf/gltf_document.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/modules/gltf/gltf_document.cpp b/modules/gltf/gltf_document.cpp
index 30d023606f..24d43858b5 100644
--- a/modules/gltf/gltf_document.cpp
+++ b/modules/gltf/gltf_document.cpp
@@ -5531,7 +5531,10 @@ struct EditorSceneImporterGLTFInterpolate<Quaternion> {
template <class T>
T GLTFDocument::_interpolate_track(const Vector<float> &p_times, const Vector<T> &p_values, const float p_time, const GLTFAnimation::Interpolation p_interp) {
ERR_FAIL_COND_V(!p_values.size(), T());
- ERR_FAIL_COND_V(p_times.size() != p_values.size(), p_values[0]);
+ if (p_times.size() != p_values.size()) {
+ ERR_PRINT_ONCE("The interpolated values are not corresponding to its times.");
+ return p_values[0];
+ }
//could use binary search, worth it?
int idx = -1;
for (int i = 0; i < p_times.size(); i++) {