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

[YimingWu]

Commit: eaf3f080a5ed8539b3570f620507c03badd40b73
Author: YimingWu
Date:   Thu Oct 28 17:09:18 2021 +0800
Branches: temp-lineart-contained
https://developer.blender.org/rBeaf3f080a5ed8539b3570f620507c03badd40b73

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

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



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

diff --cc release/scripts/addons
index 27fe7f3a4f9,f2a08d80ccd..90a42907818
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 27fe7f3a4f964b53af436c4da4ddea337eff0c7e
 -Subproject commit f2a08d80ccd3c13af304525778df3905f95bd44d
++Subproject commit 90a42907818ecf4010731043d3008c8355774cb8
diff --cc source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
index 3088d54359f,f3110cf87b6..6c66fcaabd0
--- a/source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
+++ b/source/blender/gpencil_modifiers/intern/lineart/lineart_chain.c
@@@ -1190,6 -1132,9 +1190,7 @@@ void MOD_lineart_chain_offset_towards_c
    float cam[3];
    float view[3];
    float view_clamp[3];
 -  copy_v3fl_v3db(cam, rb->camera_pos);
 -  copy_v3fl_v3db(view, rb->view_vector);
+ 
    if (use_custom_camera) {
      copy_v3fl_v3db(cam, rb->camera_pos);
    }
@@@ -1209,9 -1154,9 +1210,10 @@@
      }
    }
    else {
-     LISTBASE_FOREACH (LineartEdgeChain *, rlc, &rb->chains) {
-       LISTBASE_FOREACH (LineartEdgeChainItem *, rlci, &rlc->chain) {
-         sub_v3_v3v3(dir, cam, rlci->gpos);
++    copy_v3fl_v3db(view, rb->view_vector);
+     LISTBASE_FOREACH (LineartEdgeChain *, ec, &rb->chains) {
+       LISTBASE_FOREACH (LineartEdgeChainItem *, eci, &ec->chain) {
+         sub_v3_v3v3(dir, cam, eci->gpos);
          float len_lim = dot_v3v3(view, dir) - rb->near_clip;
          normalize_v3_v3(view_clamp, view);
          mul_v3_fl(view_clamp, MIN2(dist, len_lim));