diff options
| author | Sybren A. Stüvel <sybren@blender.org> | 2021-05-20 14:00:07 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@blender.org> | 2021-05-20 14:00:07 +0300 |
| commit | 0745afeddb6041e5bc9f862a155e5f30d431a88c (patch) | |
| tree | 5ff02a23ce6784381389fa21e30bf0f78abc6c1f /intern/cycles/util | |
| parent | 3e3ecc329caa25285a4bb6cfbb69f4eb40797fe4 (diff) | |
| parent | a1954e380730ae9d116245343d9296d587907673 (diff) | |
Merge remote-tracking branch 'origin/blender-v2.93-release'
Diffstat (limited to 'intern/cycles/util')
| -rw-r--r-- | intern/cycles/util/util_vector.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/intern/cycles/util/util_vector.h b/intern/cycles/util/util_vector.h index 04fb33368d9..87cd4de8438 100644 --- a/intern/cycles/util/util_vector.h +++ b/intern/cycles/util/util_vector.h @@ -43,8 +43,8 @@ class vector : public std::vector<value_type, allocator_type> { /* Try as hard as possible to use zero memory. */ void free_memory() { - BaseClass::resize(0); - BaseClass::shrink_to_fit(); + vector<value_type, allocator_type> empty; + BaseClass::swap(empty); } /* Some external API might demand working with std::vector. */ |