[Bf-blender-cvs] [08286533c4f] lineart-shadow: Merge remote-tracking branch 'origin/master' into temp-lineart-contained

[YimingWu]

Commit: 08286533c4f97b0ee9969f89f38b4069549245af
Author: YimingWu
Date:   Sat Jul 31 08:37:35 2021 +0800
Branches: lineart-shadow
https://developer.blender.org/rB08286533c4f97b0ee9969f89f38b4069549245af

Merge remote-tracking branch 'origin/master' into temp-lineart-contained

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



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

diff --cc source/blender/makesdna/DNA_lineart_types.h
index df082d92a8b,e93cf050e18..d919c041cfe
--- a/source/blender/makesdna/DNA_lineart_types.h
+++ b/source/blender/makesdna/DNA_lineart_types.h
@@@ -70,18 -64,9 +69,16 @@@ typedef enum eLineartEdgeFlag 
    LRT_EDGE_FLAG_MATERIAL = (1 << 3),
    LRT_EDGE_FLAG_INTERSECTION = (1 << 4),
    LRT_EDGE_FLAG_LOOSE = (1 << 5),
 -  LRT_EDGE_FLAG_CHAIN_PICKED = (1 << 6),
 -  LRT_EDGE_FLAG_CLIPPED = (1 << 7),
 -  /** Limited to 8 bits, DON'T ADD ANYMORE until improvements on the data structure. */
 +  LRT_EDGE_FLAG_LIGHT_CONTOUR = (1 << 6),
 +  /* 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. */
 +  /** Also used as discarded line mark. */
 +  LRT_EDGE_FLAG_CHAIN_PICKED = (1 << 8),
 +  LRT_EDGE_FLAG_CLIPPED = (1 << 9),
 +  /** Limited to 16 bits for the entire thing. */
  } eLineartEdgeFlag;
  
 -#define LRT_EDGE_FLAG_ALL_TYPE 0x3f
 +#define LRT_EDGE_FLAG_ALL_TYPE 0x7f
 +#define LRT_EDGE_FLAG_INIT_TYPE 0x37 /* Without material & light contour */
 +#define LRT_EDGE_FLAG_TYPE_MAX_BITS 7
- 
- #endif