diff options
| author | Ankit Meel <ankitjmeel@gmail.com> | 2020-10-28 18:24:10 +0300 |
|---|---|---|
| committer | Ankit Meel <ankitjmeel@gmail.com> | 2020-10-28 18:24:10 +0300 |
| commit | 30ec0753c75ca4c4ca8744727b7ac70b12d074f6 (patch) | |
| tree | d5c90ea34d5f31fec08b74d377a1d4c15453b886 /source/blender/blenkernel/intern/lib_id_delete.c | |
| parent | fc6a1f44d2ed6b3f793cbdc806d7030d6ddac2c3 (diff) | |
Revert "Fix T81077 id_management test on macOS"
This reverts commit 2ddecfffc3d3a3a1db4ae45e8665caa2a85ab43a.
The correct fix is to compile with -fno-strict-aliasing on
release/relwithdebinfo builds also.
See the last commit/ {D9372}.
Maniphest Task T81077
Diffstat (limited to 'source/blender/blenkernel/intern/lib_id_delete.c')
| -rw-r--r-- | source/blender/blenkernel/intern/lib_id_delete.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/lib_id_delete.c b/source/blender/blenkernel/intern/lib_id_delete.c index 25c48479ef9..1e45a3c1163 100644 --- a/source/blender/blenkernel/intern/lib_id_delete.c +++ b/source/blender/blenkernel/intern/lib_id_delete.c @@ -261,9 +261,7 @@ static void id_delete(Main *bmain, const bool do_tagged_deletion) bool keep_looping = true; while (keep_looping) { ID *id, *id_next; - /* Marked volatile to avoid a macOS Clang optimization bug. See T81077. - * #last_remapped_id.next is assumed to be NULL by optimizer which is wrong. */ - volatile ID *last_remapped_id = tagged_deleted_ids.last; + ID *last_remapped_id = tagged_deleted_ids.last; keep_looping = false; /* First tag and remove from Main all datablocks directly from target lib. |