diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2020-12-28 13:23:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-28 13:23:25 +0100 |
| commit | be509bf5e4d00b33f2867e6d06a23285b2a8fd29 (patch) | |
| tree | 975e0a7384bc6fc7cf5b73b9ddc1e8eef13579d8 /editor/import/collada.h | |
| parent | 886571e0fc54914f161ab3f1ccf9bfe40411bc20 (diff) | |
| parent | 5b937d493f0046543a77a0be7920ad39f1e5fc3c (diff) | |
Merge pull request #44401 from madmiraal/rename-empty-is_empty
Rename empty() to is_empty()
Diffstat (limited to 'editor/import/collada.h')
| -rw-r--r-- | editor/import/collada.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/editor/import/collada.h b/editor/import/collada.h index 29d49d4aa7..354a3e697a 100644 --- a/editor/import/collada.h +++ b/editor/import/collada.h @@ -274,7 +274,7 @@ public: if (normal == p_vert.normal) { if (uv == p_vert.uv) { if (uv2 == p_vert.uv2) { - if (!weights.empty() || !p_vert.weights.empty()) { + if (!weights.is_empty() || !p_vert.weights.is_empty()) { if (weights.size() == p_vert.weights.size()) { for (int i = 0; i < weights.size(); i++) { if (weights[i].bone_idx != p_vert.weights[i].bone_idx) { |