[Bf-blender-cvs] [624bb6c9e24] lanpr-under-gp: LineArt: Fuzzy logic fix.

YimingWu noreply at git.blender.org
Mon Oct 19 14:25:56 CEST 2020


Commit: 624bb6c9e24b1405c5993d216293ea3730294dd4
Author: YimingWu
Date:   Mon Oct 19 20:22:44 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB624bb6c9e24b1405c5993d216293ea3730294dd4

LineArt: Fuzzy logic fix.

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

M	source/blender/editors/lineart/lineart_chain.c

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

diff --git a/source/blender/editors/lineart/lineart_chain.c b/source/blender/editors/lineart/lineart_chain.c
index e1041691fc2..f4e0434b292 100644
--- a/source/blender/editors/lineart/lineart_chain.c
+++ b/source/blender/editors/lineart/lineart_chain.c
@@ -726,16 +726,17 @@ static LineartChainRegisterEntry *lineart_chain_get_closest_cre(LineartRenderBuf
   for (cre = ba->linked_chains.first; cre; cre = next_cre) {
     next_cre = cre->next;
     if (cre->rlc->object_ref != rlc->object_ref) {
-      if (rb->fuzzy_everything || rb->fuzzy_intersections) {
-        /* If none of those are intersection lines... */
-        if ((!(cre->rlc->type & LRT_EDGE_FLAG_INTERSECTION)) &&
-            (!(rlc->object_ref->type & LRT_EDGE_FLAG_INTERSECTION))) {
-          continue; /* We don't want to chain along different objects at the moment. */
+      if (!rb->fuzzy_everything) {
+        if(rb->fuzzy_intersections){
+          /* If none of those are intersection lines... */
+          if ((!(cre->rlc->type & LRT_EDGE_FLAG_INTERSECTION)) &&
+              (!(rlc->type & LRT_EDGE_FLAG_INTERSECTION))) {
+            continue; /* We don't want to chain along different objects at the moment. */
+          }
+        }else {
+          continue;
         }
       }
-      else {
-        continue;
-      }
     }
     if (cre->rlc->picked || cre->picked) {
       // BLI_remlink(&ba->linked_chains, cre);



More information about the Bf-blender-cvs mailing list