[Bf-blender-cvs] [416ca93300d] lanpr-under-gp: LineArt: Draw freestyle marks in viewport as well.

[YimingWu]

Commit: 416ca93300ddad824982be4ee0c76c3b2a7d69f8
Author: YimingWu
Date:   Fri Sep 18 21:02:58 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rB416ca93300ddad824982be4ee0c76c3b2a7d69f8

LineArt: Draw freestyle marks in viewport as well.

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

M	source/blender/blenkernel/intern/object_update.c

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

diff --git a/source/blender/blenkernel/intern/object_update.c b/source/blender/blenkernel/intern/object_update.c
index 7f378e6e80b..1c4e0227876 100644
--- a/source/blender/blenkernel/intern/object_update.c
+++ b/source/blender/blenkernel/intern/object_update.c
@@ -175,12 +175,13 @@ void BKE_object_handle_data_update(Depsgraph *depsgraph, Scene *scene, Object *o
 
       CustomData_MeshMasks cddata_masks = scene->customdata_mask;
       CustomData_MeshMasks_update(&cddata_masks, &CD_MASK_BAREMESH);
-      if (DEG_get_mode(depsgraph) == DAG_EVAL_RENDER) {
-        /* Make sure Freestyle edge/face marks appear in DM for render (see T40315). */
+      /* Make sure Freestyle edge/face marks appear in DM for render (see T40315). Due to Line Art
+       * impementation, edge marks should also be shown in viewport. */
 #ifdef WITH_FREESTYLE
-        cddata_masks.emask |= CD_MASK_FREESTYLE_EDGE;
-        cddata_masks.pmask |= CD_MASK_FREESTYLE_FACE;
+      cddata_masks.emask |= CD_MASK_FREESTYLE_EDGE;
+      cddata_masks.pmask |= CD_MASK_FREESTYLE_FACE;
 #endif
+      if (DEG_get_mode(depsgraph) == DAG_EVAL_RENDER) {
         /* Always compute UVs, vertex colors as orcos for render. */
         cddata_masks.lmask |= CD_MASK_MLOOPUV | CD_MASK_MLOOPCOL;
         cddata_masks.vmask |= CD_MASK_ORCO | CD_MASK_PROP_COLOR;