[Bf-blender-cvs] [4ef0654449e] master: GPencil: Fix Autojoin error using layer transform

[Antonio Vazquez]

Commit: 4ef0654449e9cf9d033b9902e1c45e36f2b99c3c
Author: Antonio Vazquez
Date:   Sun Jan 17 12:35:16 2021 +0100
Branches: master
https://developer.blender.org/rB4ef0654449e9cf9d033b9902e1c45e36f2b99c3c

GPencil: Fix Autojoin error using layer transform

The target stroke bounding box was not checked properly and when using layer transform the error was noticeable, but really the error was before the layer transform commit.

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

M	source/blender/editors/gpencil/gpencil_utils.c

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

diff --git a/source/blender/editors/gpencil/gpencil_utils.c b/source/blender/editors/gpencil/gpencil_utils.c
index 9acedb97a80..42e3055ef65 100644
--- a/source/blender/editors/gpencil/gpencil_utils.c
+++ b/source/blender/editors/gpencil/gpencil_utils.c
@@ -3178,10 +3178,8 @@ bGPDstroke *ED_gpencil_stroke_nearest_to_ends(bContext *C,
     }
 
     /* Check if one of the ends is inside target stroke bounding box. */
-    if (!ED_gpencil_stroke_check_collision(gsc, gps, pt2d_start, radius, diff_mat)) {
-      continue;
-    }
-    if (!ED_gpencil_stroke_check_collision(gsc, gps, pt2d_end, radius, diff_mat)) {
+    if ((!ED_gpencil_stroke_check_collision(gsc, gps_target, pt2d_start, radius, diff_mat)) &&
+        (!ED_gpencil_stroke_check_collision(gsc, gps_target, pt2d_end, radius, diff_mat))) {
       continue;
     }
     /* Check the distance of the ends with the ends of target stroke to avoid middle contact.