[Bf-blender-cvs] [79b309bc65a] soc-2020-greasepencil-curve: GPencil: Move Curve versioning to the end of the file
Antonio Vazquez
noreply at git.blender.org
Mon Aug 24 12:22:11 CEST 2020
Commit: 79b309bc65a16d1ccf06ed48985647e437282c3e
Author: Antonio Vazquez
Date: Sat Aug 22 16:24:53 2020 +0200
Branches: soc-2020-greasepencil-curve
https://developer.blender.org/rB79b309bc65a16d1ccf06ed48985647e437282c3e
GPencil: Move Curve versioning to the end of the file
Some files were not patched. When move to master we decide if we must do a version bump.
===================================================================
M source/blender/blenloader/intern/versioning_290.c
===================================================================
diff --git a/source/blender/blenloader/intern/versioning_290.c b/source/blender/blenloader/intern/versioning_290.c
index dbec46cfbfd..7e614180028 100644
--- a/source/blender/blenloader/intern/versioning_290.c
+++ b/source/blender/blenloader/intern/versioning_290.c
@@ -346,20 +346,6 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain)
}
}
- /* Init grease pencil default curve resolution. */
- if (!DNA_struct_elem_find(fd->filesdna, "bGPdata", "int", "editcurve_resolution")) {
- LISTBASE_FOREACH (bGPdata *, gpd, &bmain->gpencils) {
- gpd->editcurve_resolution = GP_DEFAULT_CURVE_RESOLUTION;
- gpd->flag |= GP_DATA_CURVE_ADAPTIVE_RESOLUTION;
- }
- }
- /* Init grease pencil curve editing error threshold. */
- if (!DNA_struct_elem_find(fd->filesdna, "bGPdata", "float", "curve_edit_threshold")) {
- LISTBASE_FOREACH (bGPdata *, gpd, &bmain->gpencils) {
- gpd->curve_edit_threshold = GP_DEFAULT_CURVE_ERROR;
- }
- }
-
/* EEVEE Motion blur new parameters. */
if (!DNA_struct_elem_find(fd->filesdna, "SceneEEVEE", "float", "motion_blur_depth_scale")) {
LISTBASE_FOREACH (Scene *, scene, &bmain->scenes) {
@@ -531,5 +517,19 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain)
*/
{
/* Keep this block, even when empty. */
+
+ /* Init grease pencil default curve resolution. */
+ if (!DNA_struct_elem_find(fd->filesdna, "bGPdata", "int", "editcurve_resolution")) {
+ LISTBASE_FOREACH (bGPdata *, gpd, &bmain->gpencils) {
+ gpd->editcurve_resolution = GP_DEFAULT_CURVE_RESOLUTION;
+ gpd->flag |= GP_DATA_CURVE_ADAPTIVE_RESOLUTION;
+ }
+ }
+ /* Init grease pencil curve editing error threshold. */
+ if (!DNA_struct_elem_find(fd->filesdna, "bGPdata", "float", "curve_edit_threshold")) {
+ LISTBASE_FOREACH (bGPdata *, gpd, &bmain->gpencils) {
+ gpd->curve_edit_threshold = GP_DEFAULT_CURVE_ERROR;
+ }
+ }
}
}
More information about the Bf-blender-cvs
mailing list