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

[YimingWu]

Commit: caa68861c2cfb2b7eff44d101d84eda1ea7de78d
Author: YimingWu
Date:   Tue Nov 30 13:53:16 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rBcaa68861c2cfb2b7eff44d101d84eda1ea7de78d

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

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



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

diff --cc source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
index a7f04c1d2c5,1b31d672e3b..ecf4c4e3251
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
@@@ -539,12 -501,11 +539,16 @@@ static void lineart_main_occlusion_begi
    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;
 +
 +  /* This is needed because the occlusion function expects the camera vector to point towards the
 +   * camera. */
 +  negate_v3_db(rb->view_vector);
  
+   /* This is needed because the occlusion function expects the camera vector to point towards the
+    * camera. */
+   negate_v3_db(rb->view_vector);
+ 
    TaskPool *tp = BLI_task_pool_create(NULL, TASK_PRIORITY_HIGH);
  
    for (i = 0; i < thread_count; i++) {