[Bf-blender-cvs] [e4666228143] temp-lanpr-cleanup: Merge remote-tracking branch 'origin/master' into temp-lanpr-cleanup

[YimingWu]

Commit: e46662281434e759fe90be2105dd342b16021d4e
Author: YimingWu
Date:   Sat Sep 14 15:18:41 2019 +0800
Branches: temp-lanpr-cleanup
https://developer.blender.org/rBe46662281434e759fe90be2105dd342b16021d4e

Merge remote-tracking branch 'origin/master' into temp-lanpr-cleanup

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



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

diff --cc source/blender/makesdna/DNA_object_types.h
index dcf46aeab92,82a90dfe7a2..7e87d5f1d30
--- a/source/blender/makesdna/DNA_object_types.h
+++ b/source/blender/makesdna/DNA_object_types.h
@@@ -184,43 -183,10 +184,44 @@@ typedef struct Object_Runtime 
    /** Runtime grease pencil evaluated data created by modifiers */
    struct bGPDframe *gpencil_evaluated_frames;
  
-   void *_pad2; /* Padding is here for win32s unconventional struct alignment rules. */
+   unsigned short local_collections_bits;
+   short _pad2[3];
  } Object_Runtime;
  
 +typedef struct ObjectLANPRLineType {
 +  int use;
 +  char _pad[4];
 +  char target_layer[128];
 +  char target_material[128];
 +} ObjectLANPRLineType;
 +
 +typedef struct ObjectLANPR {
 +  int usage;
 +
 +  /* Separate flags for LANPR shared flag values. */
 +  int flags;
 +
 +  struct Object *target;
 +  char target_layer[128];
 +  char target_material[128];
 +
 +  ObjectLANPRLineType crease;
 +  ObjectLANPRLineType contour;
 +  ObjectLANPRLineType material;
 +  ObjectLANPRLineType edge_mark;
 +  /* Intersection not implemented as per-object */
 +
 +  int level_start;
 +  int level_end;
 +} ObjectLANPR;
 +
 +enum ObjectFeatureLine_Usage {
 +  OBJECT_FEATURE_LINE_INHERENT = 0,
 +  OBJECT_FEATURE_LINE_INCLUDE = (1 << 0),
 +  OBJECT_FEATURE_LINE_OCCLUSION_ONLY = (1 << 1),
 +  OBJECT_FEATURE_LINE_EXCLUDE = (1 << 2),
 +};
 +
  typedef struct Object {
    ID id;
    /** Animation data (must be immediately after id for utilities to use it). */