Cleanup: Adhere to our naming convention for BKE_linestyle.h API

3 files changed, 11 insertions, 11 deletions

diff --git a/source/blender/makesrna/intern/rna_color.c b/source/blender/makesrna/intern/rna_color.c
index cca78ee2d8d..fdba76e9aa2 100644
--- a/source/blender/makesrna/intern/rna_color.c
+++ b/source/blender/makesrna/intern/rna_color.c
@@ -193,7 +193,7 @@ static char *rna_ColorRamp_path(PointerRNA *ptr)
 			
 			case ID_LS:
 			{
-				char *path = BKE_path_from_ID_to_color_ramp((FreestyleLineStyle *)id, (ColorBand *)ptr->data);
+				char *path = BKE_linestyle_path_to_color_ramp((FreestyleLineStyle *)id, (ColorBand *)ptr->data);
 				if (path)
 					return path;
 				break;
@@ -277,7 +277,7 @@ static char *rna_ColorRampElement_path(PointerRNA *ptr)
 				ListBase listbase;
 				LinkData *link;
 
-				BKE_list_modifier_color_ramps((FreestyleLineStyle *)id, &listbase);
+				BKE_linestyle_modifier_list_color_ramps((FreestyleLineStyle *)id, &listbase);
 				for (link = (LinkData *)listbase.first; link; link = link->next) {
 					RNA_pointer_create(id, &RNA_ColorRamp, link->data, &ramp_ptr);
 					COLRAMP_GETPATH;
diff --git a/source/blender/makesrna/intern/rna_linestyle.c b/source/blender/makesrna/intern/rna_linestyle.c
index faff39e679a..8fad74797b7 100644
--- a/source/blender/makesrna/intern/rna_linestyle.c
+++ b/source/blender/makesrna/intern/rna_linestyle.c
@@ -286,7 +286,7 @@ static void rna_LineStyle_update(Main *UNUSED(bmain), Scene *UNUSED(scene), Poin
 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);
+	LineStyleModifier *modifier = BKE_linestyle_modifier_add_color(linestyle, name, type);
 
 	if (!modifier) {
 		BKE_report(reports, RPT_ERROR, "Failed to add the color modifier");
@@ -304,7 +304,7 @@ static void rna_LineStyle_color_modifier_remove(FreestyleLineStyle *linestyle, R
 {
 	LineStyleModifier *modifier = modifier_ptr->data;
 
-	if (BKE_remove_linestyle_color_modifier(linestyle, modifier) == -1) {
+	if (BKE_linestyle_modifier_remove_color(linestyle, modifier) == -1) {
 		BKE_reportf(reports, RPT_ERROR, "Color modifier '%s' could not be removed", modifier->name);
 		return;
 	}
@@ -318,7 +318,7 @@ static void rna_LineStyle_color_modifier_remove(FreestyleLineStyle *linestyle, R
 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);
+	LineStyleModifier *modifier = BKE_linestyle_modifier_add_alpha(linestyle, name, type);
 
 	if (!modifier) {
 		BKE_report(reports, RPT_ERROR, "Failed to add the alpha modifier");
@@ -336,7 +336,7 @@ static void rna_LineStyle_alpha_modifier_remove(FreestyleLineStyle *linestyle, R
 {
 	LineStyleModifier *modifier = modifier_ptr->data;
 
-	if (BKE_remove_linestyle_alpha_modifier(linestyle, modifier) == -1) {
+	if (BKE_linestyle_modifier_remove_alpha(linestyle, modifier) == -1) {
 		BKE_reportf(reports, RPT_ERROR, "Alpha modifier '%s' could not be removed", modifier->name);
 		return;
 	}
@@ -350,7 +350,7 @@ static void rna_LineStyle_alpha_modifier_remove(FreestyleLineStyle *linestyle, R
 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);
+	LineStyleModifier *modifier = BKE_linestyle_modifier_add_thickness(linestyle, name, type);
 
 	if (!modifier) {
 		BKE_report(reports, RPT_ERROR, "Failed to add the thickness modifier");
@@ -368,7 +368,7 @@ static void rna_LineStyle_thickness_modifier_remove(FreestyleLineStyle *linestyl
 {
 	LineStyleModifier *modifier = modifier_ptr->data;
 
-	if (BKE_remove_linestyle_thickness_modifier(linestyle, modifier) == -1) {
+	if (BKE_linestyle_modifier_remove_thickness(linestyle, modifier) == -1) {
 		BKE_reportf(reports, RPT_ERROR, "Thickness modifier '%s' could not be removed", modifier->name);
 		return;
 	}
@@ -382,7 +382,7 @@ static void rna_LineStyle_thickness_modifier_remove(FreestyleLineStyle *linestyl
 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);
+	LineStyleModifier *modifier = BKE_linestyle_modifier_add_geometry(linestyle, name, type);
 
 	if (!modifier) {
 		BKE_report(reports, RPT_ERROR, "Failed to add the geometry modifier");
@@ -400,7 +400,7 @@ static void rna_LineStyle_geometry_modifier_remove(FreestyleLineStyle *linestyle
 {
 	LineStyleModifier *modifier = modifier_ptr->data;
 
-	if (BKE_remove_linestyle_geometry_modifier(linestyle, modifier) == -1) {
+	if (BKE_linestyle_modifier_remove_geometry(linestyle, modifier) == -1) {
 		BKE_reportf(reports, RPT_ERROR, "Geometry modifier '%s' could not be removed", modifier->name);
 		return;
 	}
diff --git a/source/blender/makesrna/intern/rna_main_api.c b/source/blender/makesrna/intern/rna_main_api.c
index bac1f132126..a94a46a0e7e 100644
--- a/source/blender/makesrna/intern/rna_main_api.c
+++ b/source/blender/makesrna/intern/rna_main_api.c
@@ -685,7 +685,7 @@ static void rna_Main_grease_pencil_remove(Main *bmain, ReportList *reports, Poin
 
 FreestyleLineStyle *rna_Main_linestyles_new(Main *bmain, const char *name)
 {
-	FreestyleLineStyle *linestyle = BKE_new_linestyle(name, bmain);
+	FreestyleLineStyle *linestyle = BKE_linestyle_new(name, bmain);
 	id_us_min(&linestyle->id);
 	return linestyle;
 }