From 2e53b646f6f02ab112e0823b9577ff2e1920faae Mon Sep 17 00:00:00 2001 From: YimingWu Date: Fri, 13 Nov 2020 17:20:20 +0800 Subject: GPencil: Remove "angle_split" from Multiply modifier. --- source/blender/makesdna/DNA_gpencil_modifier_types.h | 7 +------ source/blender/makesrna/intern/rna_gpencil_modifier.c | 11 ----------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/source/blender/makesdna/DNA_gpencil_modifier_types.h b/source/blender/makesdna/DNA_gpencil_modifier_types.h index 7107e131eda..f84265eea1d 100644 --- a/source/blender/makesdna/DNA_gpencil_modifier_types.h +++ b/source/blender/makesdna/DNA_gpencil_modifier_types.h @@ -685,7 +685,6 @@ typedef struct MultiplyGpencilModifierData { int flag; /** Custom index for passes. */ int layer_pass; - char _pad[4]; int flags; @@ -698,14 +697,10 @@ typedef struct MultiplyGpencilModifierData { float fading_thickness; float fading_opacity; - /* in rad not deg */ - float split_angle; - - /* char _pad[4]; */ } MultiplyGpencilModifierData; typedef enum eMultiplyGpencil_Flag { - GP_MULTIPLY_ENABLE_ANGLE_SPLITTING = (1 << 1), + /* GP_MULTIPLY_ENABLE_ANGLE_SPLITTING = (1 << 1), Deprecated. */ GP_MULTIPLY_ENABLE_FADING = (1 << 2), } eMultiplyGpencil_Flag; diff --git a/source/blender/makesrna/intern/rna_gpencil_modifier.c b/source/blender/makesrna/intern/rna_gpencil_modifier.c index abbb55734e5..19264aeebd7 100644 --- a/source/blender/makesrna/intern/rna_gpencil_modifier.c +++ b/source/blender/makesrna/intern/rna_gpencil_modifier.c @@ -2109,22 +2109,11 @@ static void rna_def_modifier_gpencilmultiply(BlenderRNA *brna) RNA_def_property_ui_text(prop, "Inverse Pass", "Inverse filter"); RNA_def_property_update(prop, 0, "rna_GpencilModifier_update"); - prop = RNA_def_property(srna, "enable_angle_splitting", PROP_BOOLEAN, PROP_NONE); - RNA_def_property_boolean_sdna(prop, NULL, "flags", GP_MULTIPLY_ENABLE_ANGLE_SPLITTING); - RNA_def_property_ui_text(prop, "Angle Splitting", "Enable angle splitting"); - RNA_def_property_update(prop, 0, "rna_GpencilModifier_update"); - prop = RNA_def_property(srna, "use_fade", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flags", GP_MULTIPLY_ENABLE_FADING); RNA_def_property_ui_text(prop, "Fade", "Fade the stroke thickness for each generated stroke"); RNA_def_property_update(prop, 0, "rna_GpencilModifier_update"); - prop = RNA_def_property(srna, "split_angle", PROP_FLOAT, PROP_ANGLE); - RNA_def_property_range(prop, 0, M_PI); - RNA_def_property_ui_range(prop, 0, M_PI, 10, 2); - RNA_def_property_ui_text(prop, "Angle", "Split angle for segments"); - RNA_def_property_update(prop, 0, "rna_GpencilModifier_update"); - prop = RNA_def_property(srna, "duplicates", PROP_INT, PROP_NONE); RNA_def_property_int_sdna(prop, NULL, "duplications"); RNA_def_property_range(prop, 0, 999); -- cgit v1.2.3