diff options
| author | Germano <germano.costa@ig.com.br> | 2018-01-21 23:45:47 +0300 |
|---|---|---|
| committer | Germano <germano.costa@ig.com.br> | 2018-01-21 23:45:47 +0300 |
| commit | 790025c01ed76c06e69e6054f1a718ca57771e28 (patch) | |
| tree | 7461d495f199142172b0efa34e5ad75ea65def6a /source/blender/blenkernel/intern/subsurf_ccg.c | |
| parent | 99efebd2dd24a8e0827cf0f13bc40c2844946676 (diff) | |
| parent | 8d671f6f6550605ac738f7a9727375a024614837 (diff) | |
Merge branch 'master' into blender2.8
# Conflicts:
# intern/cycles/blender/blender_mesh.cpp
# source/blender/editors/screen/screen_ops.c
# source/blender/editors/space_view3d/drawobject.c
Diffstat (limited to 'source/blender/blenkernel/intern/subsurf_ccg.c')
| -rw-r--r-- | source/blender/blenkernel/intern/subsurf_ccg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/subsurf_ccg.c b/source/blender/blenkernel/intern/subsurf_ccg.c index 5e2fb220327..fa83567c3b9 100644 --- a/source/blender/blenkernel/intern/subsurf_ccg.c +++ b/source/blender/blenkernel/intern/subsurf_ccg.c @@ -1552,7 +1552,7 @@ static void ccgDM_copyFinalLoopArray(DerivedMesh *dm, MLoop *mloop) BLI_edgehash_insert(ehash, medge[i].v1, medge[i].v2, SET_INT_IN_POINTER(i)); } - atomic_cas_ptr((void**)&ccgdm->ehash, ccgdm->ehash, ehash); + atomic_cas_ptr((void **)&ccgdm->ehash, ccgdm->ehash, ehash); } BLI_mutex_unlock(&ccgdm->loops_cache_lock); } |