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

[Jeroen Bakker]

Commit: 72c8f5ef1d2bb98f44bf15bd4dcbb19007bcf01c
Author: Jeroen Bakker
Date:   Mon Jun 7 13:41:05 2021 +0200
Branches: temp-T88822-gpu-thread-safe-index-builder
https://developer.blender.org/rB72c8f5ef1d2bb98f44bf15bd4dcbb19007bcf01c

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 39732259e65,ee80a3c458c..7e15abd7c5a
--- a/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc
+++ b/source/blender/draw/intern/mesh_extractors/extract_mesh_ibo_points.cc
@@@ -153,10 -158,9 +176,8 @@@ 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.data_type = MR_DATA_NONE;
--  extractor.use_threading = true;
    extractor.mesh_buffer_offset = offsetof(MeshBufferCache, ibo.points);
    return extractor;
  }