Commit: 23f725e78cbe631283e31792574f0932361a19a8 Author: Falk David Date: Mon Aug 24 16:42:41 2020 +0200 Branches: soc-2020-greasepencil-curve https://developer.blender.org/rB23f725e78cbe631283e31792574f0932361a19a8
GPencil: Rename parameters =================================================================== M release/scripts/startup/bl_ui/space_view3d.py M source/blender/blenkernel/intern/gpencil.c M source/blender/blenkernel/intern/gpencil_curve.c M source/blender/blenkernel/intern/gpencil_geom.c M source/blender/blenloader/intern/versioning_290.c M source/blender/makesdna/DNA_gpencil_types.h M source/blender/makesrna/intern/rna_gpencil.c =================================================================== diff --git a/release/scripts/startup/bl_ui/space_view3d.py b/release/scripts/startup/bl_ui/space_view3d.py index 05aac191c2e..e52d8592fc9 100644 --- a/release/scripts/startup/bl_ui/space_view3d.py +++ b/release/scripts/startup/bl_ui/space_view3d.py @@ -6959,7 +6959,7 @@ class VIEW3D_PT_gpencil_curve_edit(Panel): col = layout.column(align=True) col.prop(gpd, "edit_curve_resolution") col.prop(gpd, "curve_edit_threshold") - col.prop(gpd, "curve_corner_angle") + col.prop(gpd, "curve_edit_corner_angle") col.prop(gpd, "use_adaptive_curve_resolution") diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c index d6b2a358f63..1bf7429cbdb 100644 --- a/source/blender/blenkernel/intern/gpencil.c +++ b/source/blender/blenkernel/intern/gpencil.c @@ -541,7 +541,7 @@ bGPdata *BKE_gpencil_data_addnew(Main *bmain, const char name[]) gpd->pixfactor = GP_DEFAULT_PIX_FACTOR; - gpd->editcurve_resolution = GP_DEFAULT_CURVE_RESOLUTION; + gpd->curve_edit_resolution = GP_DEFAULT_CURVE_RESOLUTION; gpd->curve_edit_threshold = GP_DEFAULT_CURVE_ERROR; /* use adaptive curve resolution by default */ gpd->flag |= GP_DATA_CURVE_ADAPTIVE_RESOLUTION; diff --git a/source/blender/blenkernel/intern/gpencil_curve.c b/source/blender/blenkernel/intern/gpencil_curve.c index 0b4a438c67d..76901f91e34 100644 --- a/source/blender/blenkernel/intern/gpencil_curve.c +++ b/source/blender/blenkernel/intern/gpencil_curve.c @@ -767,7 +767,7 @@ void BKE_gpencil_stroke_editcurve_update(bGPdata *gpd, bGPDlayer *gpl, bGPDstrok float stroke_radius = ((gps->thickness + gpl->line_change) / defaultpixsize) / 2.0f; bGPDcurve *editcurve = BKE_gpencil_stroke_editcurve_generate( - gps, gpd->curve_edit_threshold, gpd->curve_corner_angle, stroke_radius); + gps, gpd->curve_edit_threshold, gpd->curve_edit_corner_angle, stroke_radius); if (editcurve == NULL) { return; } diff --git a/source/blender/blenkernel/intern/gpencil_geom.c b/source/blender/blenkernel/intern/gpencil_geom.c index 691b713cc57..646a77f2638 100644 --- a/source/blender/blenkernel/intern/gpencil_geom.c +++ b/source/blender/blenkernel/intern/gpencil_geom.c @@ -1284,7 +1284,7 @@ void BKE_gpencil_stroke_geometry_update(bGPdata *gpd, bGPDstroke *gps) if (gps->flag & GP_STROKE_NEEDS_CURVE_UPDATE) { bool is_adaptive = gpd->flag & GP_DATA_CURVE_ADAPTIVE_RESOLUTION; BKE_gpencil_stroke_update_geometry_from_editcurve( - gps, gpd->editcurve_resolution, is_adaptive); + gps, gpd->curve_edit_resolution, is_adaptive); gps->flag &= ~GP_STROKE_NEEDS_CURVE_UPDATE; } } diff --git a/source/blender/blenloader/intern/versioning_290.c b/source/blender/blenloader/intern/versioning_290.c index 7e614180028..e79fc186503 100644 --- a/source/blender/blenloader/intern/versioning_290.c +++ b/source/blender/blenloader/intern/versioning_290.c @@ -519,9 +519,9 @@ 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")) { + if (!DNA_struct_elem_find(fd->filesdna, "bGPdata", "int", "curve_edit_resolution")) { LISTBASE_FOREACH (bGPdata *, gpd, &bmain->gpencils) { - gpd->editcurve_resolution = GP_DEFAULT_CURVE_RESOLUTION; + gpd->curve_edit_resolution = GP_DEFAULT_CURVE_RESOLUTION; gpd->flag |= GP_DATA_CURVE_ADAPTIVE_RESOLUTION; } } diff --git a/source/blender/makesdna/DNA_gpencil_types.h b/source/blender/makesdna/DNA_gpencil_types.h index 3554a1d5851..60d7c5f482f 100644 --- a/source/blender/makesdna/DNA_gpencil_types.h +++ b/source/blender/makesdna/DNA_gpencil_types.h @@ -39,7 +39,7 @@ struct Curve; #define GP_DEFAULT_CURVE_RESOLUTION 32 #define GP_DEFAULT_CURVE_ERROR 0.1f -#define GP_DEFAULT_CURVE_CORNER_ANGLE 1.57079632679489661923 /* pi/2 */ +#define GP_DEFAULT_curve_edit_corner_angle 1.57079632679489661923 /* pi/2 */ /* ***************************************** */ /* GP Stroke Points */ @@ -630,11 +630,11 @@ typedef struct bGPdata { /** Settings for this data-block. */ int flag; /** Default resolution for generated curves using curve editing method. */ - int editcurve_resolution; + int curve_edit_resolution; /** Curve Editing error threshold */ float curve_edit_threshold; /** Curve Editing corner angle (less or equal is treated as corner) */ - float curve_corner_angle; + float curve_edit_corner_angle; /* Palettes */ /** List of bGPDpalette's - Deprecated (2.78 - 2.79 only). */ diff --git a/source/blender/makesrna/intern/rna_gpencil.c b/source/blender/makesrna/intern/rna_gpencil.c index ac83210455c..480e01f8eb6 100644 --- a/source/blender/makesrna/intern/rna_gpencil.c +++ b/source/blender/makesrna/intern/rna_gpencil.c @@ -2362,7 +2362,7 @@ static void rna_def_gpencil_data(BlenderRNA *brna) RNA_def_property_update(prop, NC_GPENCIL | ND_DATA, "rna_GPencil_update"); prop = RNA_def_property(srna, "edit_curve_resolution", PROP_INT, PROP_NONE); - RNA_def_property_int_sdna(prop, NULL, "editcurve_resolution"); + RNA_def_property_int_sdna(prop, NULL, "curve_edit_resolution"); RNA_def_property_range(prop, 1, 256); RNA_def_property_ui_range(prop, 1, 64, 1, 1); RNA_def_property_int_default(prop, GP_DEFAULT_CURVE_RESOLUTION); @@ -2395,8 +2395,8 @@ static void rna_def_gpencil_data(BlenderRNA *brna) RNA_def_property_clear_flag(prop, PROP_ANIMATABLE); /* Curve editing corner angle. */ - prop = RNA_def_property(srna, "curve_corner_angle", PROP_FLOAT, PROP_ANGLE); - RNA_def_property_float_sdna(prop, NULL, "curve_corner_angle"); + prop = RNA_def_property(srna, "curve_edit_corner_angle", PROP_FLOAT, PROP_ANGLE); + RNA_def_property_float_sdna(prop, NULL, "curve_edit_corner_angle"); RNA_def_property_range(prop, 0.0f, DEG2RADF(180.0f)); RNA_def_property_float_default(prop, DEG2RADF(90.0f)); RNA_def_property_ui_text(prop, "Corner Angle", "Angle threshold to be treated as corners."); _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org https://lists.blender.org/mailman/listinfo/bf-blender-cvs