diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2018-01-03 15:44:47 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2018-01-03 15:44:47 +0300 |
| commit | be403891652a375e5a0ac61b493342ca6d39afb7 (patch) | |
| tree | ef9637103db6d66c4b311cba5b705d575562a1f8 /source/blender/blenkernel/BKE_subsurf.h | |
| parent | 060fdb49d64857ff1cbf9937420ed70b10b17086 (diff) | |
| parent | cbc7aa80d49e3b36c9ecc0e27ec528b34c491fc1 (diff) | |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/BKE_subsurf.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_subsurf.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/source/blender/blenkernel/BKE_subsurf.h b/source/blender/blenkernel/BKE_subsurf.h index 92170325113..d7b9d20d7b0 100644 --- a/source/blender/blenkernel/BKE_subsurf.h +++ b/source/blender/blenkernel/BKE_subsurf.h @@ -34,6 +34,9 @@ /* struct DerivedMesh is used directly */ #include "BKE_DerivedMesh.h" +/* Thread sync primitives used directly. */ +#include "BLI_threads.h" + struct CCGElem; struct DMFlagMat; struct DMGridAdjacency; @@ -140,6 +143,9 @@ typedef struct CCGDerivedMesh { } multires; struct EdgeHash *ehash; + + ThreadRWMutex loops_cache_rwlock; + ThreadRWMutex origindex_cache_rwlock; } CCGDerivedMesh; #ifdef WITH_OPENSUBDIV |