[Bf-blender-cvs] [f7081aac316] lineart-shadow: Merge branch 'temp-lineart-contained' into lineart-shadow

[YimingWu]

Commit: f7081aac316842b3251ddac5160c8ca162d0c572
Author: YimingWu
Date:   Thu Apr 7 19:33:52 2022 +0800
Branches: lineart-shadow
https://developer.blender.org/rBf7081aac316842b3251ddac5160c8ca162d0c572

Merge branch 'temp-lineart-contained' into lineart-shadow

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



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

diff --cc source/blender/makesdna/DNA_lineart_types.h
index 6c77b567c6f,bf3b62320f6..903748b3aa8
--- a/source/blender/makesdna/DNA_lineart_types.h
+++ b/source/blender/makesdna/DNA_lineart_types.h
@@@ -52,17 -52,15 +52,20 @@@ typedef enum eLineartEdgeFlag 
    /* LRT_EDGE_FLAG_FOR_FUTURE = (1 << 7), */
    /* Limited to 8 bits for edge type flag, don't add anymore because BMEdge->head.eflag only has 8
       bits. So unless we changed this into a non-single-bit flag thing, we keep it this way. */
 +
 +  /* Shaow edge type doesn't go into BMEdge->head.eflag so we can make it higher than 1<<7. */
 +  LRT_EDGE_FLAG_PROJECTED_SHADOW = (1 << 8),
 +  /* To determine an edge to be occluded from the front or back face it's lying on. */
 +  LRT_EDGE_FLAG_SHADOW_FACING_LIGHT = (1 << 9),
    /** Also used as discarded line mark. */
 -  LRT_EDGE_FLAG_CHAIN_PICKED = (1 << 8),
 -  LRT_EDGE_FLAG_CLIPPED = (1 << 9),
 +  LRT_EDGE_FLAG_CHAIN_PICKED = (1 << 10),
 +  LRT_EDGE_FLAG_CLIPPED = (1 << 11),
    /** Limited to 16 bits for the entire thing. */
+ 
+   /** For object loading code to use only. */
+   LRT_EDGE_FLAG_INHIBIT = (1 << 14),
  } eLineartEdgeFlag;
  
 -#define LRT_EDGE_FLAG_ALL_TYPE 0x7f
 +#define LRT_EDGE_FLAG_ALL_TYPE 0x01ff
  #define LRT_EDGE_FLAG_INIT_TYPE 0x37 /* Without material & light contour */
  #define LRT_EDGE_FLAG_TYPE_MAX_BITS 7