diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-23 18:29:00 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2017-11-23 18:29:00 +0300 |
| commit | 5330e7fd292e1bb5ea3ba08f80fa6b9be5f0d987 (patch) | |
| tree | ffff29bbc9acba22409f21f773f843d7622558b8 /source/blender/blenkernel/intern/pbvh.c | |
| parent | 35e8138c95d59851c772f96e5e5f507055fe38f0 (diff) | |
| parent | 580b34e52b0cf231cea70891831efd4b1b1c4ee2 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/intern/pbvh.c')
| -rw-r--r-- | source/blender/blenkernel/intern/pbvh.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/pbvh.c b/source/blender/blenkernel/intern/pbvh.c index 6fc89eb778a..585a18cdad5 100644 --- a/source/blender/blenkernel/intern/pbvh.c +++ b/source/blender/blenkernel/intern/pbvh.c @@ -1008,9 +1008,7 @@ static void pbvh_update_normals_store_task_cb(void *userdata, const int n) MVert *mvert = &bvh->verts[v]; /* mvert is shared between nodes, hence between threads. */ - if (atomic_fetch_and_and_uint8( - (uint8_t *)&mvert->flag, (uint8_t)~ME_VERT_PBVH_UPDATE) & ME_VERT_PBVH_UPDATE) - { + if (atomic_fetch_and_and_char(&mvert->flag, (char)~ME_VERT_PBVH_UPDATE) & ME_VERT_PBVH_UPDATE) { normalize_v3(vnors[v]); normal_float_to_short_v3(mvert->no, vnors[v]); } |