[Bf-blender-cvs] [1f6f4576333] asset-browser: Fix mistake in a previous commit

Julian Eisel noreply at git.blender.org
Sat Nov 14 01:53:45 CET 2020


Commit: 1f6f457633314b8d440119b88ed23018abe069f4
Author: Julian Eisel
Date:   Sat Nov 14 01:08:19 2020 +0100
Branches: asset-browser
https://developer.blender.org/rB1f6f457633314b8d440119b88ed23018abe069f4

Fix mistake in a previous commit

Mistake in a8f610a7e5a9114f53.

===================================================================

M	source/blender/blenkernel/intern/icons.c

===================================================================

diff --git a/source/blender/blenkernel/intern/icons.c b/source/blender/blenkernel/intern/icons.c
index 692312d33b1..57d7bfbe8a3 100644
--- a/source/blender/blenkernel/intern/icons.c
+++ b/source/blender/blenkernel/intern/icons.c
@@ -554,7 +554,7 @@ ImBuf *BKE_previewimg_to_imbuf(PreviewImage *prv, const int size)
 void BKE_previewimg_finish(PreviewImage *prv, const int size)
 {
   /* Previews may be calculated on a thread. */
-  atomic_fetch_and_or_int32(&prv->flag[size], ~PRV_UNFINISHED);
+  atomic_fetch_and_and_int32(&prv->flag[size], ~PRV_UNFINISHED);
 }
 
 bool BKE_previewimg_is_finished(const PreviewImage *prv, const int size)



More information about the Bf-blender-cvs mailing list