[Bf-blender-cvs] [150b8799699] temp-ui-tweaks: Merge branch 'master' into temp-ui-tweaks

[Pablo Vazquez]

Commit: 150b8799699a2a727f091a6403fdbf939deffee6
Author: Pablo Vazquez
Date:   Wed Sep 22 16:40:14 2021 +0200
Branches: temp-ui-tweaks
https://developer.blender.org/rB150b8799699a2a727f091a6403fdbf939deffee6

Merge branch 'master' into temp-ui-tweaks

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



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

diff --cc source/blender/makesdna/DNA_gpencil_modifier_defaults.h
index 450527c7443,2a3c6f4e3db..532c5339957
--- a/source/blender/makesdna/DNA_gpencil_modifier_defaults.h
+++ b/source/blender/makesdna/DNA_gpencil_modifier_defaults.h
@@@ -314,28 -325,32 +325,50 @@@
    { \
      .start_fac = 0.1f,\
      .end_fac = 0.1f,\
-     .overshoot_fac = 0.01f,\
+     .overshoot_fac = 0.1f,\
      .pass_index = 0,\
      .material = NULL,\
+     .flag = GP_LENGTH_USE_CURVATURE,\
+     .point_density = 30.0f,\
+     .segment_influence = 0.0f,\
+     .max_angle = DEG2RAD(170.0f),\
+   }
+ 
+ #define _DNA_DEFAULT_DashGpencilModifierData \
+   { \
+     .dash_offset = 0, \
+     .segments = NULL, \
+     .segments_len = 1, \
+     .segment_active_index = 0, \
+   }
+ 
+ #define _DNA_DEFAULT_DashGpencilModifierSegment \
+   { \
+     .name = "", \
+     .dash = 2, \
+     .gap = 1, \
+     .radius = 1.0f, \
+     .opacity = 1.0f, \
+     .mat_nr = -1, \
    }
  
 +#define _DNA_DEFAULT_DashGpencilModifierData \
 +  { \
 +    .dash_offset = 0, \
 +    .segments = NULL, \
 +    .segments_len = 1, \
 +    .segment_active_index = 0, \
 +  }
 +
 +#define _DNA_DEFAULT_DashGpencilModifierSegment \
 +  { \
 +    .name = "", \
 +    .dash = 2, \
 +    .gap = 1, \
 +    .radius = 1.0f, \
 +    .opacity = 1.0f, \
 +    .mat_nr = -1, \
 +  }
 +
  
  /* clang-format off */