[Bf-blender-cvs] [ceb3b7098c1] lanpr-under-gp: Merge remote-tracking branch 'DarkdefenderRepo/npr_tess_2_90' into lanpr-under-gp

[YimingWu]

Commit: ceb3b7098c112564ae88bc21b0efbea57f757e6d
Author: YimingWu
Date:   Fri Jul 24 23:57:16 2020 +0800
Branches: lanpr-under-gp
https://developer.blender.org/rBceb3b7098c112564ae88bc21b0efbea57f757e6d

Merge remote-tracking branch 'DarkdefenderRepo/npr_tess_2_90' into lanpr-under-gp

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



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

diff --cc source/blender/makesdna/DNA_modifier_types.h
index 8c564bda3d0,d0413958c09..9285e3ca47a
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@@ -2158,9 -2147,30 +2159,30 @@@ typedef struct SimulationModifierData 
    ModifierData modifier;
  
    struct Simulation *simulation;
 -  char data_path[64];
 +  char *data_path;
  } SimulationModifierData;
  
+ typedef struct SmoothContourModifierData {
+   ModifierData modifier;
+ 
+   struct Object *camera_ob;
+   void *osd_eval;
+   int flag;
+   short _pad[2];
+ } SmoothContourModifierData;
+ 
+ enum {
+   MOD_SMOOTHCONTOUR_TRIANG = (1 << 0),
+   MOD_SMOOTHCONTOUR_FF_SPLIT = (1 << 1),
+   MOD_SMOOTHCONTOUR_CUSP_D = (1 << 2),
+   MOD_SMOOTHCONTOUR_CUSP_I = (1 << 3),
+   MOD_SMOOTHCONTOUR_FB_SPLIT = (1 << 4),
+   MOD_SMOOTHCONTOUR_RAD_I = (1 << 5),
+   MOD_SMOOTHCONTOUR_RAD_FLIP = (1 << 6),
+   MOD_SMOOTHCONTOUR_OPTI = (1 << 7),
+   MOD_SMOOTHCONTOUR_SEL = (1 << 8),
+ };
+ 
  #ifdef __cplusplus
  }
  #endif