Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-09-19 19:08:14 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-09-19 19:08:14 +0300
commitaf170839afc6334bb3ce9ea62624c6c103707dc6 (patch)
treef3536c500ad8982ce9d49dcd8014ce37904575a3 /source/blender/blenkernel/BKE_DerivedMesh.h
parent2cdc2f2a2542f31c1c11a9913830f0ff7846888a (diff)
parentb31faac17eaf66e034107f136bb00dd16361a0bf (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/blenkernel/BKE_DerivedMesh.h')
-rw-r--r--source/blender/blenkernel/BKE_DerivedMesh.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/source/blender/blenkernel/BKE_DerivedMesh.h b/source/blender/blenkernel/BKE_DerivedMesh.h
index c86595cd509..9bb44a726de 100644
--- a/source/blender/blenkernel/BKE_DerivedMesh.h
+++ b/source/blender/blenkernel/BKE_DerivedMesh.h
@@ -192,7 +192,9 @@ struct DerivedMesh {
* \warning Typical access is done via #getLoopTriArray, #getNumLoopTri.
*/
struct {
- struct MLoopTri *array;
+ /* WARNING! swapping between array (ready-to-be-used data) and array_wip (where data is actually computed)
+ * shall always be protected by same lock as one used for looptris computing. */
+ struct MLoopTri *array, *array_wip;
int num;
int num_alloc;
} looptris;