[Bf-blender-cvs] [b17a2c87c81] temp-T88822-gpu-thread-safe-index-builder: Merge branch 'master' into temp-T88822-gpu-thread-safe-index-builder

[Jeroen Bakker]

Commit: b17a2c87c813e75be78c2f23b1add2d1fe53350c
Author: Jeroen Bakker
Date:   Tue Jun 8 16:27:37 2021 +0200
Branches: temp-T88822-gpu-thread-safe-index-builder
https://developer.blender.org/rBb17a2c87c813e75be78c2f23b1add2d1fe53350c

Merge branch 'master' into temp-T88822-gpu-thread-safe-index-builder

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



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

diff --cc source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc
index 7d3a69fab7c,d749a3ab8d1..9220198d799
--- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc
+++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc
@@@ -176,9 -158,9 +176,10 @@@ constexpr MeshExtract create_extractor_
    extractor.iter_ledge_mesh = extract_points_iter_ledge_mesh;
    extractor.iter_lvert_bm = extract_points_iter_lvert_bm;
    extractor.iter_lvert_mesh = extract_points_iter_lvert_mesh;
 +  extractor.task_finish = extract_points_task_finish;
    extractor.finish = extract_points_finish;
 +  extractor.use_threading = true;
+   extractor.data_type = MR_DATA_NONE;
 -  extractor.use_threading = false;
    extractor.mesh_buffer_offset = offsetof(MeshBufferCache, ibo.points);
    return extractor;
  }