[Bf-blender-cvs] [02bcfeb214c] lineart-shadow: Merge branch 'temp-lineart-contained' into lineart-shadow

[YimingWu]

Commit: 02bcfeb214cd78255522a344f78d8bc10218e48b
Author: YimingWu
Date:   Wed Dec 1 17:03:26 2021 +0800
Branches: lineart-shadow
https://developer.blender.org/rB02bcfeb214cd78255522a344f78d8bc10218e48b

Merge branch 'temp-lineart-contained' into lineart-shadow

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

M	release/datafiles/locale
M	release/scripts/addons
M	source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
M	source/tools

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

diff --git a/release/datafiles/locale b/release/datafiles/locale
index 78b4e0c9a51..6178bad247c 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit 78b4e0c9a513650b961826aeeafc324487f5e1aa
+Subproject commit 6178bad247c69c9c4e1a98c5f35765752341b3ae
diff --git a/release/scripts/addons b/release/scripts/addons
index b3c179b2869..f6107e2fd9a 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit b3c179b2869d86c44a4b29e2c638ce2a596a820d
+Subproject commit f6107e2fd9a92b55ac110c7db941e287e2f6604a
diff --git a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
index 5379ff318bc..45b16f40ae3 100644
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_cpu.c
@@ -550,10 +550,6 @@ static void lineart_main_occlusion_begin(LineartRenderBuffer *rb)
   rb->light_contour.last = rb->light_contour.first;
   rb->shadow.last = rb->shadow.first;
 
-  /* 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++) {
@@ -1615,7 +1611,7 @@ static uint16_t lineart_identify_feature_line(LineartRenderBuffer *rb,
   if (rb->use_contour || rb->use_back_face_culling) {
 
     if (rb->cam_is_persp) {
-      sub_v3_v3v3_db(view_vector, l->gloc, rb->camera_pos);
+      sub_v3_v3v3_db(view_vector, rb->camera_pos, l->gloc);
     }
     else {
       view_vector = rb->view_vector;
@@ -1628,12 +1624,12 @@ static uint16_t lineart_identify_feature_line(LineartRenderBuffer *rb,
       edge_flag_result |= LRT_EDGE_FLAG_CONTOUR;
     }
 
-    /* Because the camera ray starts from camera, so backface is when dot value being positive. */
+    /* Because the ray points towards the camera, so backface is when dot value being negative.*/
     if (rb->use_back_face_culling) {
-      if (dot_1 > 0) {
+      if (dot_1 < 0) {
         tri1->flags |= LRT_CULL_DISCARD;
       }
-      if (dot_2 > 0) {
+      if (dot_2 < 0) {
         tri2->flags |= LRT_CULL_DISCARD;
       }
     }
diff --git a/source/tools b/source/tools
index cc857792a49..b22d19e47f4 160000
--- a/source/tools
+++ b/source/tools
@@ -1 +1 @@
-Subproject commit cc857792a49b4b9cab51f185803cdecdaa10e6eb
+Subproject commit b22d19e47f4d0353082f3d9f30ee8d244c5266d5