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

[Antonio Vazquez]

Commit: 7042491b31f7160541bf16896305f71c2175046d
Author: Antonio Vazquez
Date:   Tue May 4 15:56:24 2021 +0200
Branches: temp-gpencil-bezier-stroke-type
https://developer.blender.org/rB7042491b31f7160541bf16896305f71c2175046d

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

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



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

diff --cc source/blender/blenloader/intern/versioning_300.c
index b0f5ccbf0f1,ee38ad707a4..2a16c4eb629
--- a/source/blender/blenloader/intern/versioning_300.c
+++ b/source/blender/blenloader/intern/versioning_300.c
@@@ -25,9 -24,10 +25,11 @@@
  #include "BLI_utildefines.h"
  
  #include "DNA_genfile.h"
 +#include "DNA_gpencil_types.h"
  #include "DNA_modifier_types.h"
+ #include "DNA_text_types.h"
  
+ #include "BKE_lib_id.h"
  #include "BKE_main.h"
  
  #include "BLO_readfile.h"
@@@ -78,16 -74,17 +76,28 @@@ void blo_do_versions_300(FileData *fd, 
          }
        }
      }
 +
 +    /* 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.
+    *
+    * \note Be sure to check when bumping the version:
+    * - "versioning_userdef.c", #blo_do_versions_userdef
+    * - "versioning_userdef.c", #do_versions_theme
+    *
+    * \note Keep this message at the bottom of the function.
+    */
+   {
+     /* Keep this block, even when empty. */
+   }
  }