[Bf-blender-cvs] [aa07f958faa] lanpr-under-gp: LineArt: GPencil modifier flag change to mode (wrong use of variable).

[YimingWu]

Commit: aa07f958faa08763b75b69b41e7d6795e4b4b620
Author: YimingWu
Date:   Thu Aug 20 18:11:56 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rBaa07f958faa08763b75b69b41e7d6795e4b4b620

LineArt: GPencil modifier flag change to mode (wrong use of variable).

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

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

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

diff --git a/source/blender/editors/lineart/lineart_cpu.c 
b/source/blender/editors/lineart/lineart_cpu.c
index 21c903dd438..afdb39c9506 100644
--- a/source/blender/editors/lineart/lineart_cpu.c
+++ b/source/blender/editors/lineart/lineart_cpu.c
@@ -2546,15 +2546,16 @@ static int lineart_occlusion_get_max_level(Depsgraph 
*dg)
                          DEG_ITER_OBJECT_FLAG_LINKED_DIRECTLY | 
DEG_ITER_OBJECT_FLAG_VISIBLE |
                              DEG_ITER_OBJECT_FLAG_DUPLI | 
DEG_ITER_OBJECT_FLAG_LINKED_VIA_SET) {
     if (ob->type == OB_GPENCIL) {
-      LISTBASE_FOREACH (GpencilModifierData *, md, 
&ob->greasepencil_modifiers) {
+      Object *use_ob = ob->id.orig_id ? (Object *)ob->id.orig_id : ob;
+      LISTBASE_FOREACH (GpencilModifierData *, md, 
&use_ob->greasepencil_modifiers) {
         if (md->type == eGpencilModifierType_Lineart) {
           if (mode == DAG_EVAL_RENDER) {
-            if (!(md->flag & eGpencilModifierMode_Render)) {
+            if (!(md->mode & eGpencilModifierMode_Render)) {
               continue;
             }
           }
           else {
-            if (!(md->flag & eGpencilModifierMode_Realtime)) {
+            if (!(md->mode & eGpencilModifierMode_Realtime)) {
               continue;
             }
           }
@@ -3501,6 +3502,7 @@ int ED_lineart_compute_feature_lines_internal(Depsgraph 
*depsgraph, const int sh
   rb->triangle_size = lineart_triangle_size_get(rb, scene);
 
   rb->max_occlusion_level = lineart_occlusion_get_max_level(depsgraph);
+  printf("%d\n", rb->max_occlusion_level);
 
   if (show_frame_progress) {
     ED_lineart_update_render_progress(0, "LRT: Loading geometries.");

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs