[Bf-blender-cvs] [c2254194f8a] soc-2019-npr: LANPR: Chaining is force enabled for engines other than LANPR.

[YimingWu]

Commit: c2254194f8a0b282b85e7d6212bed70c9dc7433a
Author: YimingWu
Date:   Mon Jul 1 16:06:43 2019 +0800
Branches: soc-2019-npr
https://developer.blender.org/rBc2254194f8a0b282b85e7d6212bed70c9dc7433a

LANPR: Chaining is force enabled for engines other than LANPR.

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

M	source/blender/blenkernel/intern/scene.c
M	source/blender/draw/engines/lanpr/lanpr_ops.c

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

diff --git a/source/blender/blenkernel/intern/scene.c b/source/blender/blenkernel/intern/scene.c
index 2254a15afa9..1cae41a6693 100644
--- a/source/blender/blenkernel/intern/scene.c
+++ b/source/blender/blenkernel/intern/scene.c
@@ -107,6 +107,7 @@
 
 const char *RE_engine_id_BLENDER_EEVEE = "BLENDER_EEVEE";
 const char *RE_engine_id_BLENDER_WORKBENCH = "BLENDER_WORKBENCH";
+const char *RE_engine_id_BLENDER_LANPR = "BLENDER_LANPR";
 const char *RE_engine_id_CYCLES = "CYCLES";
 
 void free_avicodecdata(AviCodecData *acd)
diff --git a/source/blender/draw/engines/lanpr/lanpr_ops.c b/source/blender/draw/engines/lanpr/lanpr_ops.c
index 4311831f5e4..fda2c6e8c39 100644
--- a/source/blender/draw/engines/lanpr/lanpr_ops.c
+++ b/source/blender/draw/engines/lanpr/lanpr_ops.c
@@ -46,6 +46,7 @@
 #include "lanpr_access.h"
 
 extern LANPR_SharedResource lanpr_share;
+extern const char *RE_engine_id_BLENDER_LANPR;
 struct Object;
 
 int lanpr_triangle_line_imagespace_intersection_v2(SpinLock *spl,
@@ -4189,7 +4190,8 @@ int lanpr_compute_feature_lines_internal(Depsgraph *depsgraph)
 
   lanpr_THREAD_calculate_line_occlusion_begin(rb);
 
-  if (lanpr->enable_chaining) {
+  /* When not using LANPR engine, chaining is forced in order to generate data for GPencil. */
+  if (lanpr->enable_chaining || strcmp(s->r.engine, RE_engine_id_BLENDER_LANPR)) {
     lanpr_NO_THREAD_chain_feature_lines(rb); /*  should use user_adjustable value */
     lanpr_split_chains_for_fixed_occlusion(rb);
     lanpr_connect_chains(rb, 1);