From a31962287a543c0c41eb5289fa1c7dad0d5cca41 Mon Sep 17 00:00:00 2001 From: Tamito Kajiyama Date: Tue, 13 May 2014 09:15:12 +0900 Subject: Freestyle: Added .new() and .remove() methods to collection types of line style modifiers. --- source/blender/blenkernel/BKE_linestyle.h | 16 +- source/blender/blenkernel/intern/linestyle.c | 69 ++++--- source/blender/editors/render/render_shading.c | 8 +- source/blender/makesrna/intern/rna_linestyle.c | 250 +++++++++++++++++++++++++ 4 files changed, 304 insertions(+), 39 deletions(-) (limited to 'source/blender') diff --git a/source/blender/blenkernel/BKE_linestyle.h b/source/blender/blenkernel/BKE_linestyle.h index 13d111cb93b..8bc8cc44d92 100644 --- a/source/blender/blenkernel/BKE_linestyle.h +++ b/source/blender/blenkernel/BKE_linestyle.h @@ -48,20 +48,20 @@ FreestyleLineStyle *BKE_new_linestyle(const char *name, struct Main *main); void BKE_free_linestyle(FreestyleLineStyle *linestyle); FreestyleLineStyle *BKE_copy_linestyle(FreestyleLineStyle *linestyle); -LineStyleModifier *BKE_add_linestyle_color_modifier(FreestyleLineStyle *linestyle, int type); -LineStyleModifier *BKE_add_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, int type); -LineStyleModifier *BKE_add_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, int type); -LineStyleModifier *BKE_add_linestyle_geometry_modifier(FreestyleLineStyle *linestyle, int type); +LineStyleModifier *BKE_add_linestyle_color_modifier(FreestyleLineStyle *linestyle, const char *name, int type); +LineStyleModifier *BKE_add_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, const char *name, int type); +LineStyleModifier *BKE_add_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, const char *name, int type); +LineStyleModifier *BKE_add_linestyle_geometry_modifier(FreestyleLineStyle *linestyle, const char *name, int type); LineStyleModifier *BKE_copy_linestyle_color_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m); LineStyleModifier *BKE_copy_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m); LineStyleModifier *BKE_copy_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m); LineStyleModifier *BKE_copy_linestyle_geometry_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m); -void BKE_remove_linestyle_color_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier); -void BKE_remove_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier); -void BKE_remove_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier); -void BKE_remove_linestyle_geometry_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier); +int BKE_remove_linestyle_color_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier); +int BKE_remove_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier); +int BKE_remove_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier); +int BKE_remove_linestyle_geometry_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier); void BKE_move_linestyle_color_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier, int direction); void BKE_move_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *modifier, int direction); diff --git a/source/blender/blenkernel/intern/linestyle.c b/source/blender/blenkernel/intern/linestyle.c index 8028bdbc327..8ef966a7288 100644 --- a/source/blender/blenkernel/intern/linestyle.c +++ b/source/blender/blenkernel/intern/linestyle.c @@ -99,7 +99,7 @@ static void default_linestyle_settings(FreestyleLineStyle *linestyle) BLI_listbase_clear(&linestyle->thickness_modifiers); BLI_listbase_clear(&linestyle->geometry_modifiers); - BKE_add_linestyle_geometry_modifier(linestyle, LS_MODIFIER_SAMPLING); + BKE_add_linestyle_geometry_modifier(linestyle, NULL, LS_MODIFIER_SAMPLING); linestyle->caps = LS_CAPS_BUTT; } @@ -209,13 +209,16 @@ FreestyleLineStyle *BKE_copy_linestyle(FreestyleLineStyle *linestyle) return new_linestyle; } -static LineStyleModifier *new_modifier(int type, size_t size) +static LineStyleModifier *new_modifier(const char *name, int type, size_t size) { LineStyleModifier *m; + if (!name) { + name = modifier_name[type]; + } m = (LineStyleModifier *)MEM_callocN(size, "line style modifier"); m->type = type; - BLI_strncpy(m->name, modifier_name[type], sizeof(m->name)); + BLI_strncpy(m->name, name, sizeof(m->name)); m->influence = 1.0f; m->flags = LS_MODIFIER_ENABLED | LS_MODIFIER_EXPANDED; @@ -228,7 +231,7 @@ static void add_to_modifier_list(ListBase *lb, LineStyleModifier *m) BLI_uniquename(lb, m, modifier_name[m->type], '.', offsetof(LineStyleModifier, name), sizeof(m->name)); } -static LineStyleModifier *alloc_color_modifier(int type) +static LineStyleModifier *alloc_color_modifier(const char *name, int type) { size_t size; @@ -249,14 +252,14 @@ static LineStyleModifier *alloc_color_modifier(int type) return NULL; /* unknown modifier type */ } - return new_modifier(type, size); + return new_modifier(name, type, size); } -LineStyleModifier *BKE_add_linestyle_color_modifier(FreestyleLineStyle *linestyle, int type) +LineStyleModifier *BKE_add_linestyle_color_modifier(FreestyleLineStyle *linestyle, const char *name, int type) { LineStyleModifier *m; - m = alloc_color_modifier(type); + m = alloc_color_modifier(name, type); m->blend = MA_RAMP_BLEND; switch (type) { @@ -290,7 +293,7 @@ LineStyleModifier *BKE_copy_linestyle_color_modifier(FreestyleLineStyle *linesty { LineStyleModifier *new_m; - new_m = alloc_color_modifier(m->type); + new_m = alloc_color_modifier(m->name, m->type); new_m->influence = m->influence; new_m->flags = m->flags; new_m->blend = m->blend; @@ -341,8 +344,10 @@ LineStyleModifier *BKE_copy_linestyle_color_modifier(FreestyleLineStyle *linesty return new_m; } -void BKE_remove_linestyle_color_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m) +int BKE_remove_linestyle_color_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m) { + if (BLI_findindex(&linestyle->color_modifiers, m) == -1) + return -1; switch (m->type) { case LS_MODIFIER_ALONG_STROKE: MEM_freeN(((LineStyleColorModifier_AlongStroke *)m)->color_ramp); @@ -358,9 +363,10 @@ void BKE_remove_linestyle_color_modifier(FreestyleLineStyle *linestyle, LineStyl break; } BLI_freelinkN(&linestyle->color_modifiers, m); + return 0; } -static LineStyleModifier *alloc_alpha_modifier(int type) +static LineStyleModifier *alloc_alpha_modifier(const char *name, int type) { size_t size; @@ -380,14 +386,14 @@ static LineStyleModifier *alloc_alpha_modifier(int type) default: return NULL; /* unknown modifier type */ } - return new_modifier(type, size); + return new_modifier(name, type, size); } -LineStyleModifier *BKE_add_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, int type) +LineStyleModifier *BKE_add_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, const char *name, int type) { LineStyleModifier *m; - m = alloc_alpha_modifier(type); + m = alloc_alpha_modifier(name, type); m->blend = LS_VALUE_BLEND; switch (type) { @@ -433,7 +439,7 @@ LineStyleModifier *BKE_copy_linestyle_alpha_modifier(FreestyleLineStyle *linesty { LineStyleModifier *new_m; - new_m = alloc_alpha_modifier(m->type); + new_m = alloc_alpha_modifier(m->name, m->type); new_m->influence = m->influence; new_m->flags = m->flags; new_m->blend = m->blend; @@ -487,8 +493,10 @@ LineStyleModifier *BKE_copy_linestyle_alpha_modifier(FreestyleLineStyle *linesty return new_m; } -void BKE_remove_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m) +int BKE_remove_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m) { + if (BLI_findindex(&linestyle->alpha_modifiers, m) == -1) + return -1; switch (m->type) { case LS_MODIFIER_ALONG_STROKE: curvemapping_free(((LineStyleAlphaModifier_AlongStroke *)m)->curve); @@ -504,9 +512,10 @@ void BKE_remove_linestyle_alpha_modifier(FreestyleLineStyle *linestyle, LineStyl break; } BLI_freelinkN(&linestyle->alpha_modifiers, m); + return 0; } -static LineStyleModifier *alloc_thickness_modifier(int type) +static LineStyleModifier *alloc_thickness_modifier(const char *name, int type) { size_t size; @@ -530,14 +539,14 @@ static LineStyleModifier *alloc_thickness_modifier(int type) return NULL; /* unknown modifier type */ } - return new_modifier(type, size); + return new_modifier(name, type, size); } -LineStyleModifier *BKE_add_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, int type) +LineStyleModifier *BKE_add_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, const char *name, int type) { LineStyleModifier *m; - m = alloc_thickness_modifier(type); + m = alloc_thickness_modifier(name, type); m->blend = LS_VALUE_BLEND; switch (type) { @@ -599,7 +608,7 @@ LineStyleModifier *BKE_copy_linestyle_thickness_modifier(FreestyleLineStyle *lin { LineStyleModifier *new_m; - new_m = alloc_thickness_modifier(m->type); + new_m = alloc_thickness_modifier(m->name, m->type); if (!new_m) return NULL; new_m->influence = m->influence; @@ -672,8 +681,10 @@ LineStyleModifier *BKE_copy_linestyle_thickness_modifier(FreestyleLineStyle *lin return new_m; } -void BKE_remove_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m) +int BKE_remove_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m) { + if (BLI_findindex(&linestyle->thickness_modifiers, m) == -1) + return -1; switch (m->type) { case LS_MODIFIER_ALONG_STROKE: curvemapping_free(((LineStyleThicknessModifier_AlongStroke *)m)->curve); @@ -691,9 +702,10 @@ void BKE_remove_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, Line break; } BLI_freelinkN(&linestyle->thickness_modifiers, m); + return 0; } -static LineStyleModifier *alloc_geometry_modifier(int type) +static LineStyleModifier *alloc_geometry_modifier(const char *name, int type) { size_t size; @@ -741,14 +753,14 @@ static LineStyleModifier *alloc_geometry_modifier(int type) return NULL; /* unknown modifier type */ } - return new_modifier(type, size); + return new_modifier(name, type, size); } -LineStyleModifier *BKE_add_linestyle_geometry_modifier(FreestyleLineStyle *linestyle, int type) +LineStyleModifier *BKE_add_linestyle_geometry_modifier(FreestyleLineStyle *linestyle, const char *name, int type) { LineStyleModifier *m; - m = alloc_geometry_modifier(type); + m = alloc_geometry_modifier(name, type); switch (type) { case LS_MODIFIER_SAMPLING: @@ -866,7 +878,7 @@ LineStyleModifier *BKE_copy_linestyle_geometry_modifier(FreestyleLineStyle *line { LineStyleModifier *new_m; - new_m = alloc_geometry_modifier(m->type); + new_m = alloc_geometry_modifier(m->name, m->type); new_m->flags = m->flags; switch (m->type) { @@ -996,9 +1008,12 @@ LineStyleModifier *BKE_copy_linestyle_geometry_modifier(FreestyleLineStyle *line return new_m; } -void BKE_remove_linestyle_geometry_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m) +int BKE_remove_linestyle_geometry_modifier(FreestyleLineStyle *linestyle, LineStyleModifier *m) { + if (BLI_findindex(&linestyle->geometry_modifiers, m) == -1) + return -1; BLI_freelinkN(&linestyle->geometry_modifiers, m); + return 0; } static void move_modifier(ListBase *lb, LineStyleModifier *modifier, int direction) diff --git a/source/blender/editors/render/render_shading.c b/source/blender/editors/render/render_shading.c index 97f6b346666..4166a52691f 100644 --- a/source/blender/editors/render/render_shading.c +++ b/source/blender/editors/render/render_shading.c @@ -916,7 +916,7 @@ static int freestyle_color_modifier_add_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - if (BKE_add_linestyle_color_modifier(lineset->linestyle, type) == NULL) { + if (BKE_add_linestyle_color_modifier(lineset->linestyle, NULL, type) == NULL) { BKE_report(op->reports, RPT_ERROR, "Unknown line color modifier type"); return OPERATOR_CANCELLED; } @@ -955,7 +955,7 @@ static int freestyle_alpha_modifier_add_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - if (BKE_add_linestyle_alpha_modifier(lineset->linestyle, type) == NULL) { + if (BKE_add_linestyle_alpha_modifier(lineset->linestyle, NULL, type) == NULL) { BKE_report(op->reports, RPT_ERROR, "Unknown alpha transparency modifier type"); return OPERATOR_CANCELLED; } @@ -994,7 +994,7 @@ static int freestyle_thickness_modifier_add_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - if (BKE_add_linestyle_thickness_modifier(lineset->linestyle, type) == NULL) { + if (BKE_add_linestyle_thickness_modifier(lineset->linestyle, NULL, type) == NULL) { BKE_report(op->reports, RPT_ERROR, "Unknown line thickness modifier type"); return OPERATOR_CANCELLED; } @@ -1033,7 +1033,7 @@ static int freestyle_geometry_modifier_add_exec(bContext *C, wmOperator *op) return OPERATOR_CANCELLED; } - if (BKE_add_linestyle_geometry_modifier(lineset->linestyle, type) == NULL) { + if (BKE_add_linestyle_geometry_modifier(lineset->linestyle, NULL, type) == NULL) { BKE_report(op->reports, RPT_ERROR, "Unknown stroke geometry modifier type"); return OPERATOR_CANCELLED; } diff --git a/source/blender/makesrna/intern/rna_linestyle.c b/source/blender/makesrna/intern/rna_linestyle.c index 027aed83509..a04e054fa84 100644 --- a/source/blender/makesrna/intern/rna_linestyle.c +++ b/source/blender/makesrna/intern/rna_linestyle.c @@ -87,6 +87,8 @@ EnumPropertyItem linestyle_geometry_modifier_type_items[] = { #include "BKE_texture.h" #include "BKE_depsgraph.h" +#include "RNA_access.h" + static StructRNA *rna_LineStyle_color_modifier_refine(struct PointerRNA *ptr) { LineStyleModifier *m = (LineStyleModifier *)ptr->data; @@ -281,6 +283,134 @@ static void rna_LineStyle_update(Main *UNUSED(bmain), Scene *UNUSED(scene), Poin WM_main_add_notifier(NC_LINESTYLE, linestyle); } +static LineStyleModifier *rna_LineStyle_color_modifier_add(FreestyleLineStyle *linestyle, ReportList *reports, + const char *name, int type) +{ + LineStyleModifier *modifier = BKE_add_linestyle_color_modifier(linestyle, name, type); + + if (!modifier) { + BKE_report(reports, RPT_ERROR, "Failed to add the color modifier"); + return NULL; + } + + DAG_id_tag_update(&linestyle->id, 0); + WM_main_add_notifier(NC_LINESTYLE, linestyle); + + return modifier; +} + +static void rna_LineStyle_color_modifier_remove(FreestyleLineStyle *linestyle, ReportList *reports, + PointerRNA *modifier_ptr) +{ + LineStyleModifier *modifier = modifier_ptr->data; + + if (BKE_remove_linestyle_color_modifier(linestyle, modifier) == -1) { + BKE_reportf(reports, RPT_ERROR, "Color modifier '%s' could not be removed", modifier->name); + return; + } + + RNA_POINTER_INVALIDATE(modifier_ptr); + + DAG_id_tag_update(&linestyle->id, 0); + WM_main_add_notifier(NC_LINESTYLE, linestyle); +} + +static LineStyleModifier *rna_LineStyle_alpha_modifier_add(FreestyleLineStyle *linestyle, ReportList *reports, + const char *name, int type) +{ + LineStyleModifier *modifier = BKE_add_linestyle_alpha_modifier(linestyle, name, type); + + if (!modifier) { + BKE_report(reports, RPT_ERROR, "Failed to add the alpha modifier"); + return NULL; + } + + DAG_id_tag_update(&linestyle->id, 0); + WM_main_add_notifier(NC_LINESTYLE, linestyle); + + return modifier; +} + +static void rna_LineStyle_alpha_modifier_remove(FreestyleLineStyle *linestyle, ReportList *reports, + PointerRNA *modifier_ptr) +{ + LineStyleModifier *modifier = modifier_ptr->data; + + if (BKE_remove_linestyle_alpha_modifier(linestyle, modifier) == -1) { + BKE_reportf(reports, RPT_ERROR, "Alpha modifier '%s' could not be removed", modifier->name); + return; + } + + RNA_POINTER_INVALIDATE(modifier_ptr); + + DAG_id_tag_update(&linestyle->id, 0); + WM_main_add_notifier(NC_LINESTYLE, linestyle); +} + +static LineStyleModifier *rna_LineStyle_thickness_modifier_add(FreestyleLineStyle *linestyle, ReportList *reports, + const char *name, int type) +{ + LineStyleModifier *modifier = BKE_add_linestyle_thickness_modifier(linestyle, name, type); + + if (!modifier) { + BKE_report(reports, RPT_ERROR, "Failed to add the thickness modifier"); + return NULL; + } + + DAG_id_tag_update(&linestyle->id, 0); + WM_main_add_notifier(NC_LINESTYLE, linestyle); + + return modifier; +} + +static void rna_LineStyle_thickness_modifier_remove(FreestyleLineStyle *linestyle, ReportList *reports, + PointerRNA *modifier_ptr) +{ + LineStyleModifier *modifier = modifier_ptr->data; + + if (BKE_remove_linestyle_thickness_modifier(linestyle, modifier) == -1) { + BKE_reportf(reports, RPT_ERROR, "Thickness modifier '%s' could not be removed", modifier->name); + return; + } + + RNA_POINTER_INVALIDATE(modifier_ptr); + + DAG_id_tag_update(&linestyle->id, 0); + WM_main_add_notifier(NC_LINESTYLE, linestyle); +} + +static LineStyleModifier *rna_LineStyle_geometry_modifier_add(FreestyleLineStyle *linestyle, ReportList *reports, + const char *name, int type) +{ + LineStyleModifier *modifier = BKE_add_linestyle_geometry_modifier(linestyle, name, type); + + if (!modifier) { + BKE_report(reports, RPT_ERROR, "Failed to add the geometry modifier"); + return NULL; + } + + DAG_id_tag_update(&linestyle->id, 0); + WM_main_add_notifier(NC_LINESTYLE, linestyle); + + return modifier; +} + +static void rna_LineStyle_geometry_modifier_remove(FreestyleLineStyle *linestyle, ReportList *reports, + PointerRNA *modifier_ptr) +{ + LineStyleModifier *modifier = modifier_ptr->data; + + if (BKE_remove_linestyle_geometry_modifier(linestyle, modifier) == -1) { + BKE_reportf(reports, RPT_ERROR, "Geometry modifier '%s' could not be removed", modifier->name); + return; + } + + RNA_POINTER_INVALIDATE(modifier_ptr); + + DAG_id_tag_update(&linestyle->id, 0); + WM_main_add_notifier(NC_LINESTYLE, linestyle); +} + #else #include "BLI_math.h" @@ -1021,6 +1151,122 @@ static void rna_def_linestyle_modifiers(BlenderRNA *brna) RNA_def_property_update(prop, NC_LINESTYLE, NULL); } +static void rna_def_freestyle_color_modifiers(BlenderRNA *brna, PropertyRNA *cprop) +{ + StructRNA *srna; + FunctionRNA *func; + PropertyRNA *parm; + + RNA_def_property_srna(cprop, "LineStyleColorModifiers"); + srna = RNA_def_struct(brna, "LineStyleColorModifiers", NULL); + RNA_def_struct_sdna(srna, "FreestyleLineStyle"); + RNA_def_struct_ui_text(srna, "Color Modifiers", "Color modifiers for changing line colors"); + + func = RNA_def_function(srna, "new", "rna_LineStyle_color_modifier_add"); + RNA_def_function_ui_description(func, "Add a color modifier to line style"); + RNA_def_function_flag(func, FUNC_USE_REPORTS); + parm = RNA_def_string(func, "name", "ColorModifier", 0, "", "New name for the color modifier (not unique)"); + RNA_def_property_flag(parm, PROP_REQUIRED); + parm = RNA_def_enum(func, "type", linestyle_color_modifier_type_items, 0, "", "Color modifier type to add"); + RNA_def_property_flag(parm, PROP_REQUIRED); + parm = RNA_def_pointer(func, "modifier", "LineStyleColorModifier", "", "Newly added color modifier"); + RNA_def_function_return(func, parm); + + func = RNA_def_function(srna, "remove", "rna_LineStyle_color_modifier_remove"); + RNA_def_function_ui_description(func, "Remove a color modifier from line style"); + RNA_def_function_flag(func, FUNC_USE_REPORTS); + parm = RNA_def_pointer(func, "modifier", "LineStyleColorModifier", "", "Color modifier to remove"); + RNA_def_property_flag(parm, PROP_REQUIRED | PROP_NEVER_NULL | PROP_RNAPTR); + RNA_def_property_clear_flag(parm, PROP_THICK_WRAP); +} + +static void rna_def_freestyle_alpha_modifiers(BlenderRNA *brna, PropertyRNA *cprop) +{ + StructRNA *srna; + FunctionRNA *func; + PropertyRNA *parm; + + RNA_def_property_srna(cprop, "LineStyleAlphaModifiers"); + srna = RNA_def_struct(brna, "LineStyleAlphaModifiers", NULL); + RNA_def_struct_sdna(srna, "FreestyleLineStyle"); + RNA_def_struct_ui_text(srna, "Alpha Modifiers", "Alpha modifiers for changing line alphas"); + + func = RNA_def_function(srna, "new", "rna_LineStyle_alpha_modifier_add"); + RNA_def_function_ui_description(func, "Add a alpha modifier to line style"); + RNA_def_function_flag(func, FUNC_USE_REPORTS); + parm = RNA_def_string(func, "name", "AlphaModifier", 0, "", "New name for the alpha modifier (not unique)"); + RNA_def_property_flag(parm, PROP_REQUIRED); + parm = RNA_def_enum(func, "type", linestyle_alpha_modifier_type_items, 0, "", "Alpha modifier type to add"); + RNA_def_property_flag(parm, PROP_REQUIRED); + parm = RNA_def_pointer(func, "modifier", "LineStyleAlphaModifier", "", "Newly added alpha modifier"); + RNA_def_function_return(func, parm); + + func = RNA_def_function(srna, "remove", "rna_LineStyle_alpha_modifier_remove"); + RNA_def_function_ui_description(func, "Remove a alpha modifier from line style"); + RNA_def_function_flag(func, FUNC_USE_REPORTS); + parm = RNA_def_pointer(func, "modifier", "LineStyleAlphaModifier", "", "Alpha modifier to remove"); + RNA_def_property_flag(parm, PROP_REQUIRED | PROP_NEVER_NULL | PROP_RNAPTR); + RNA_def_property_clear_flag(parm, PROP_THICK_WRAP); +} + +static void rna_def_freestyle_thickness_modifiers(BlenderRNA *brna, PropertyRNA *cprop) +{ + StructRNA *srna; + FunctionRNA *func; + PropertyRNA *parm; + + RNA_def_property_srna(cprop, "LineStyleThicknessModifiers"); + srna = RNA_def_struct(brna, "LineStyleThicknessModifiers", NULL); + RNA_def_struct_sdna(srna, "FreestyleLineStyle"); + RNA_def_struct_ui_text(srna, "Thickness Modifiers", "Thickness modifiers for changing line thicknesss"); + + func = RNA_def_function(srna, "new", "rna_LineStyle_thickness_modifier_add"); + RNA_def_function_ui_description(func, "Add a thickness modifier to line style"); + RNA_def_function_flag(func, FUNC_USE_REPORTS); + parm = RNA_def_string(func, "name", "ThicknessModifier", 0, "", "New name for the thickness modifier (not unique)"); + RNA_def_property_flag(parm, PROP_REQUIRED); + parm = RNA_def_enum(func, "type", linestyle_thickness_modifier_type_items, 0, "", "Thickness modifier type to add"); + RNA_def_property_flag(parm, PROP_REQUIRED); + parm = RNA_def_pointer(func, "modifier", "LineStyleThicknessModifier", "", "Newly added thickness modifier"); + RNA_def_function_return(func, parm); + + func = RNA_def_function(srna, "remove", "rna_LineStyle_thickness_modifier_remove"); + RNA_def_function_ui_description(func, "Remove a thickness modifier from line style"); + RNA_def_function_flag(func, FUNC_USE_REPORTS); + parm = RNA_def_pointer(func, "modifier", "LineStyleThicknessModifier", "", "Thickness modifier to remove"); + RNA_def_property_flag(parm, PROP_REQUIRED | PROP_NEVER_NULL | PROP_RNAPTR); + RNA_def_property_clear_flag(parm, PROP_THICK_WRAP); +} + +static void rna_def_freestyle_geometry_modifiers(BlenderRNA *brna, PropertyRNA *cprop) +{ + StructRNA *srna; + FunctionRNA *func; + PropertyRNA *parm; + + RNA_def_property_srna(cprop, "LineStyleGeometryModifiers"); + srna = RNA_def_struct(brna, "LineStyleGeometryModifiers", NULL); + RNA_def_struct_sdna(srna, "FreestyleLineStyle"); + RNA_def_struct_ui_text(srna, "Geometry Modifiers", "Geometry modifiers for changing line geometrys"); + + func = RNA_def_function(srna, "new", "rna_LineStyle_geometry_modifier_add"); + RNA_def_function_ui_description(func, "Add a geometry modifier to line style"); + RNA_def_function_flag(func, FUNC_USE_REPORTS); + parm = RNA_def_string(func, "name", "GeometryModifier", 0, "", "New name for the geometry modifier (not unique)"); + RNA_def_property_flag(parm, PROP_REQUIRED); + parm = RNA_def_enum(func, "type", linestyle_geometry_modifier_type_items, 0, "", "Geometry modifier type to add"); + RNA_def_property_flag(parm, PROP_REQUIRED); + parm = RNA_def_pointer(func, "modifier", "LineStyleGeometryModifier", "", "Newly added geometry modifier"); + RNA_def_function_return(func, parm); + + func = RNA_def_function(srna, "remove", "rna_LineStyle_geometry_modifier_remove"); + RNA_def_function_ui_description(func, "Remove a geometry modifier from line style"); + RNA_def_function_flag(func, FUNC_USE_REPORTS); + parm = RNA_def_pointer(func, "modifier", "LineStyleGeometryModifier", "", "Geometry modifier to remove"); + RNA_def_property_flag(parm, PROP_REQUIRED | PROP_NEVER_NULL | PROP_RNAPTR); + RNA_def_property_clear_flag(parm, PROP_THICK_WRAP); +} + static void rna_def_linestyle(BlenderRNA *brna) { StructRNA *srna; @@ -1126,16 +1372,19 @@ static void rna_def_linestyle(BlenderRNA *brna) RNA_def_property_collection_sdna(prop, NULL, "color_modifiers", NULL); RNA_def_property_struct_type(prop, "LineStyleColorModifier"); RNA_def_property_ui_text(prop, "Color Modifiers", "List of line color modifiers"); + rna_def_freestyle_color_modifiers(brna, prop); prop = RNA_def_property(srna, "alpha_modifiers", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "alpha_modifiers", NULL); RNA_def_property_struct_type(prop, "LineStyleAlphaModifier"); RNA_def_property_ui_text(prop, "Alpha Modifiers", "List of alpha transparency modifiers"); + rna_def_freestyle_alpha_modifiers(brna, prop); prop = RNA_def_property(srna, "thickness_modifiers", PROP_COLLECTION, PROP_NONE); RNA_def_property_collection_sdna(prop, NULL, "thickness_modifiers", NULL); RNA_def_property_struct_type(prop, "LineStyleThicknessModifier"); RNA_def_property_ui_text(prop, "Thickness Modifiers", "List of line thickness modifiers"); + rna_def_freestyle_thickness_modifiers(brna, prop); prop = RNA_def_property(srna, "use_chaining", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_negative_sdna(prop, NULL, "flag", LS_NO_CHAINING); @@ -1158,6 +1407,7 @@ static void rna_def_linestyle(BlenderRNA *brna) RNA_def_property_collection_sdna(prop, NULL, "geometry_modifiers", NULL); RNA_def_property_struct_type(prop, "LineStyleGeometryModifier"); RNA_def_property_ui_text(prop, "Geometry Modifiers", "List of stroke geometry modifiers"); + rna_def_freestyle_geometry_modifiers(brna, prop); prop = RNA_def_property(srna, "use_same_object", PROP_BOOLEAN, PROP_NONE); RNA_def_property_boolean_sdna(prop, NULL, "flag", LS_SAME_OBJECT); -- cgit v1.2.3