From f508292277d7a12c04b2cb2655622683ee4fef54 Mon Sep 17 00:00:00 2001 From: Falk David Date: Mon, 18 Jan 2021 16:15:50 +0100 Subject: Fix T84719: Doversion for curve edit settings Make sure default values for curve edit mode are filled for older files. Reviewed By: antoniov Maniphest Tasks: T84719 Differential Revision: https://developer.blender.org/D10136 --- source/blender/blenloader/intern/versioning_290.c | 29 ++++++++++++----------- 1 file changed, 15 insertions(+), 14 deletions(-) (limited to 'source/blender/blenloader') diff --git a/source/blender/blenloader/intern/versioning_290.c b/source/blender/blenloader/intern/versioning_290.c index 24683351bfd..33aa472a5e5 100644 --- a/source/blender/blenloader/intern/versioning_290.c +++ b/source/blender/blenloader/intern/versioning_290.c @@ -1244,20 +1244,6 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain) part->phystype = PART_PHYS_NO; } } - /* Init grease pencil default curve resolution. */ - if (!DNA_struct_elem_find(fd->filesdna, "bGPdata", "int", "curve_edit_resolution")) { - LISTBASE_FOREACH (bGPdata *, gpd, &bmain->gpencils) { - gpd->curve_edit_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; - gpd->curve_edit_corner_angle = GP_DEFAULT_CURVE_EDIT_CORNER_ANGLE; - } - } } if (!MAIN_VERSION_ATLEAST(bmain, 291, 9)) { @@ -1569,6 +1555,21 @@ void blo_do_versions_290(FileData *fd, Library *UNUSED(lib), Main *bmain) } } FOREACH_NODETREE_END; + + /* Init grease pencil default curve resolution. */ + if (!DNA_struct_elem_find(fd->filesdna, "bGPdata", "int", "curve_edit_resolution")) { + LISTBASE_FOREACH (bGPdata *, gpd, &bmain->gpencils) { + gpd->curve_edit_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; + gpd->curve_edit_corner_angle = GP_DEFAULT_CURVE_EDIT_CORNER_ANGLE; + } + } } /** -- cgit v1.2.3