[Bf-blender-cvs] [2243de9a907] temp-lanpr-review: LANPR: Don't use background intersection calculation for GPU mode.

[YimingWu]

Commit: 2243de9a9075b2e3de59208083a5804bf7a11085
Author: YimingWu
Date:   Fri Nov 29 23:17:00 2019 +0800
Branches: temp-lanpr-review
https://developer.blender.org/rB2243de9a9075b2e3de59208083a5804bf7a11085

LANPR: Don't use background intersection calculation for GPU mode.

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

M	source/blender/draw/engines/lanpr/lanpr_engine.c

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

diff --git a/source/blender/draw/engines/lanpr/lanpr_engine.c b/source/blender/draw/engines/lanpr/lanpr_engine.c
index 3d3f0b28290..bc31b8cc11c 100644
--- a/source/blender/draw/engines/lanpr/lanpr_engine.c
+++ b/source/blender/draw/engines/lanpr/lanpr_engine.c
@@ -461,12 +461,8 @@ static void lanpr_cache_init(void *vedata)
       }
     }
     else if (draw_ctx->scene->lanpr.master_mode == LANPR_MASTER_MODE_DPIX) {
-      if (is_render) {
-        ED_lanpr_compute_feature_lines_internal(draw_ctx->depsgraph, 1);
-      }
-      else {
-        ED_lanpr_compute_feature_lines_background(draw_ctx->depsgraph, 1);
-      }
+      /* Don't do threaded intersection calculation. It's pointless in GPU mode anyway. */
+      ED_lanpr_compute_feature_lines_internal(draw_ctx->depsgraph, 1);
     }
   }
 
@@ -532,7 +528,9 @@ static void lanpr_cache_populate(void *vedata, Object *ob)
                                                   pd->atlas_edge_mask,
                                                   ob,
                                                   idx);
-      lanpr_feed_atlas_trigger_preview_obj(vedata, ob, idx);
+      if (idx != pd->begin_index) { /* Which means we are actually able to feed object data */
+        lanpr_feed_atlas_trigger_preview_obj(vedata, ob, idx);
+      }
     }
   }
 }