[Bf-blender-cvs] [296ea22a4e1] temp-gpencil-bezier-stroke-type: Merge branch 'master' into temp-gpencil-bezier-stroke-type

[Antonio Vazquez]

Commit: 296ea22a4e1cc55d3c9bc3eb683fdb0df59bc4a0
Author: Antonio Vazquez
Date:   Tue May 4 16:48:13 2021 +0200
Branches: temp-gpencil-bezier-stroke-type
https://developer.blender.org/rB296ea22a4e1cc55d3c9bc3eb683fdb0df59bc4a0

Merge branch 'master' into temp-gpencil-bezier-stroke-type

 Conflicts:
	source/blender/blenloader/intern/versioning_300.c

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index 2a16c4eb629,182231b5878..71fd75659a2
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -21,11 -21,10 +21,12 @@@
  #define DNA_DEPRECATED_ALLOW
  
  #include "BLI_listbase.h"
 +#include "BLI_math.h"
  #include "BLI_utildefines.h"
  
+ #include "DNA_brush_types.h"
  #include "DNA_genfile.h"
 +#include "DNA_gpencil_types.h"
  #include "DNA_modifier_types.h"
  #include "DNA_text_types.h"
  
@@@ -76,17 -75,14 +77,25 @@@ void blo_do_versions_300(FileData *fd, 
          }
        }
      }
+     /* Grease Pencil: Set default value for dilate pixels. */
+     if (!DNA_struct_elem_find(fd->filesdna, "BrushGpencilSettings", "int", "dilate_pixels")) {
+       LISTBASE_FOREACH (Brush *, brush, &bmain->brushes) {
+         if (brush->gpencil_settings) {
+           brush->gpencil_settings->dilate_pixels = 1;
+         }
+       }
+     }
 +
 +    /* Init grease pencil curve editing error threshold. */
 +    if (!DNA_struct_elem_find(
 +            fd->filesdna, "ToolSettings", "float", "gpencil_curve_fit_threshold")) {
 +      LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
 +        if (scene->toolsettings->sequencer_tool_settings == NULL) {
 +          scene->toolsettings->gpencil_curve_fit_threshold = GP_DEFAULT_CURVE_ERROR;
 +          scene->toolsettings->gpencil_curve_fit_corner_angle = GP_DEFAULT_CURVE_EDIT_CORNER_ANGLE;
 +        }
 +      }
 +    }
    }
    /**
     * Versioning code until next subversion bump goes here.