[Bf-blender-cvs] [b906b544e5d] temp-lineart-contained: Merge remote-tracking branch 'origin/master' into temp-lineart-contained

[YimingWu]

Commit: b906b544e5da973ba44de7d966d4c0bcfe13011b
Author: YimingWu
Date:   Wed Jun 16 22:33:16 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rBb906b544e5da973ba44de7d966d4c0bcfe13011b

Merge remote-tracking branch 'origin/master' into temp-lineart-contained

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



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

diff --cc source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
index 577fd1604a4,5a979f01bc3..66dbeb35a04
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
@@@ -499,10 -481,8 +499,10 @@@ static void lineart_main_occlusion_begi
    rb->intersection.last = rb->intersection.first;
    rb->material.last = rb->material.first;
    rb->edge_mark.last = rb->edge_mark.first;
 +  rb->floating.last = rb->floating.first;
 +  rb->light_contour.last = rb->light_contour.first;
  
-   TaskPool *tp = BLI_task_pool_create(NULL, TASK_PRIORITY_HIGH, TASK_ISOLATION_OFF);
+   TaskPool *tp = BLI_task_pool_create(NULL, TASK_PRIORITY_HIGH);
  
    for (i = 0; i < thread_count; i++) {
      rti[i].thread_id = i;