Commit: 415af0bec879b6f529fe660acca6a595c667aa5e
Author: Campbell Barton
Date: Wed Jul 16 15:13:40 2014 +1000
https://developer.blender.org/rB415af0bec879b6f529fe660acca6a595c667aa5e
Cleanup: Adhere to our naming convention for BKE_linestyle.h API
===================================================================
M source/blender/blenkernel/BKE_linestyle.h
M source/blender/blenkernel/intern/freestyle.c
M source/blender/blenkernel/intern/library.c
M source/blender/blenkernel/intern/linestyle.c
M source/blender/blenkernel/intern/object.c
M source/blender/editors/render/render_shading.c
M source/blender/editors/space_buttons/buttons_context.c
M source/blender/editors/space_buttons/buttons_texture.c
M source/blender/makesrna/intern/rna_color.c
M source/blender/makesrna/intern/rna_linestyle.c
M source/blender/makesrna/intern/rna_main_api.c
M source/blender/nodes/texture/node_texture_tree.c
===================================================================
diff --git a/source/blender/blenkernel/BKE_linestyle.h
b/source/blender/blenkernel/BKE_linestyle.h
index 3b448e1..cca4e1c 100644
--- a/source/blender/blenkernel/BKE_linestyle.h
+++ b/source/blender/blenkernel/BKE_linestyle.h
@@ -44,35 +44,35 @@ struct Main;
struct Object;
struct ColorBand;
-FreestyleLineStyle *BKE_new_linestyle(const char *name, struct Main *main);
-void BKE_free_linestyle(FreestyleLineStyle *linestyle);
-FreestyleLineStyle *BKE_copy_linestyle(FreestyleLineStyle *linestyle);
+FreestyleLineStyle *BKE_linestyle_new(const char *name, struct Main *main);
+void BKE_linestyle_free(FreestyleLineStyle *linestyle);
+FreestyleLineStyle *BKE_linestyle_copy(FreestyleLineStyle *linestyle);
-FreestyleLineStyle *BKE_get_linestyle_from_scene(struct Scene *scene);
+FreestyleLineStyle *BKE_linestyle_active_from_scene(struct Scene *scene);
-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_linestyle_modifier_add_color(FreestyleLineStyle
*linestyle, const char *name, int type);
+LineStyleModifier *BKE_linestyle_modifier_add_alpha(FreestyleLineStyle
*linestyle, const char *name, int type);
+LineStyleModifier *BKE_linestyle_modifier_add_thickness(FreestyleLineStyle
*linestyle, const char *name, int type);
+LineStyleModifier *BKE_linestyle_modifier_add_geometry(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);
+LineStyleModifier *BKE_linestyle_modifier_copy_color(FreestyleLineStyle
*linestyle, LineStyleModifier *m);
+LineStyleModifier *BKE_linestyle_modifier_copy_alpha(FreestyleLineStyle
*linestyle, LineStyleModifier *m);
+LineStyleModifier *BKE_linestyle_modifier_copy_thickness(FreestyleLineStyle
*linestyle, LineStyleModifier *m);
+LineStyleModifier *BKE_linestyle_modifier_copy_geometry(FreestyleLineStyle
*linestyle, LineStyleModifier *m);
-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);
+int BKE_linestyle_modifier_remove_color(FreestyleLineStyle *linestyle,
LineStyleModifier *modifier);
+int BKE_linestyle_modifier_remove_alpha(FreestyleLineStyle *linestyle,
LineStyleModifier *modifier);
+int BKE_linestyle_modifier_remove_thickness(FreestyleLineStyle *linestyle,
LineStyleModifier *modifier);
+int BKE_linestyle_modifier_remove_geometry(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);
-void BKE_move_linestyle_thickness_modifier(FreestyleLineStyle *linestyle,
LineStyleModifier *modifier, int direction);
-void BKE_move_linestyle_geometry_modifier(FreestyleLineStyle *linestyle,
LineStyleModifier *modifier, int direction);
+void BKE_linestyle_modifier_move_color(FreestyleLineStyle *linestyle,
LineStyleModifier *modifier, int direction);
+void BKE_linestyle_modifier_move_alpha(FreestyleLineStyle *linestyle,
LineStyleModifier *modifier, int direction);
+void BKE_linestyle_modifier_move_thickness(FreestyleLineStyle *linestyle,
LineStyleModifier *modifier, int direction);
+void BKE_linestyle_modifier_move_geometry(FreestyleLineStyle *linestyle,
LineStyleModifier *modifier, int direction);
-void BKE_list_modifier_color_ramps(FreestyleLineStyle *linestyle, ListBase
*listbase);
-char *BKE_path_from_ID_to_color_ramp(FreestyleLineStyle *linestyle, struct
ColorBand *color_ramp);
+void BKE_linestyle_modifier_list_color_ramps(FreestyleLineStyle *linestyle,
ListBase *listbase);
+char *BKE_linestyle_path_to_color_ramp(FreestyleLineStyle *linestyle, struct
ColorBand *color_ramp);
-void BKE_unlink_linestyle_target_object(FreestyleLineStyle *linestyle, struct
Object *ob);
+void BKE_linestyle_target_object_unlink(FreestyleLineStyle *linestyle, struct
Object *ob);
#endif /* __BKE_LINESTYLE_H__ */
diff --git a/source/blender/blenkernel/intern/freestyle.c
b/source/blender/blenkernel/intern/freestyle.c
index 445acc8..4aa1b49 100644
--- a/source/blender/blenkernel/intern/freestyle.c
+++ b/source/blender/blenkernel/intern/freestyle.c
@@ -187,7 +187,7 @@ FreestyleLineSet *BKE_freestyle_lineset_add(FreestyleConfig
*config, const char
BLI_addtail(&config->linesets, (void *)lineset);
BKE_freestyle_lineset_set_active_index(config, lineset_index);
- lineset->linestyle = BKE_new_linestyle("LineStyle", NULL);
+ lineset->linestyle = BKE_linestyle_new("LineStyle", NULL);
lineset->flags |= FREESTYLE_LINESET_ENABLED;
lineset->selection = FREESTYLE_SEL_VISIBILITY |
FREESTYLE_SEL_EDGE_TYPES | FREESTYLE_SEL_IMAGE_BORDER;
lineset->qi = FREESTYLE_QI_VISIBLE;
diff --git a/source/blender/blenkernel/intern/library.c
b/source/blender/blenkernel/intern/library.c
index 1f3327b..df34345 100644
--- a/source/blender/blenkernel/intern/library.c
+++ b/source/blender/blenkernel/intern/library.c
@@ -382,7 +382,7 @@ bool id_copy(ID *id, ID **newid, bool test)
if (!test) *newid = (ID *)BKE_mask_copy((Mask *)id);
return true;
case ID_LS:
- if (!test) *newid = (ID
*)BKE_copy_linestyle((FreestyleLineStyle *)id);
+ if (!test) *newid = (ID
*)BKE_linestyle_copy((FreestyleLineStyle *)id);
return true;
}
@@ -1005,7 +1005,7 @@ void BKE_libblock_free_ex(Main *bmain, void *idv, bool
do_id_user)
BKE_mask_free(bmain, (Mask *)id);
break;
case ID_LS:
- BKE_free_linestyle((FreestyleLineStyle *)id);
+ BKE_linestyle_free((FreestyleLineStyle *)id);
break;
}
diff --git a/source/blender/blenkernel/intern/linestyle.c
b/source/blender/blenkernel/intern/linestyle.c
index 5d51eb0..7a36a3e 100644
--- a/source/blender/blenkernel/intern/linestyle.c
+++ b/source/blender/blenkernel/intern/linestyle.c
@@ -100,12 +100,12 @@ 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, NULL,
LS_MODIFIER_SAMPLING);
+ BKE_linestyle_modifier_add_geometry(linestyle, NULL,
LS_MODIFIER_SAMPLING);
linestyle->caps = LS_CAPS_BUTT;
}
-FreestyleLineStyle *BKE_new_linestyle(const char *name, struct Main *main)
+FreestyleLineStyle *BKE_linestyle_new(const char *name, struct Main *main)
{
FreestyleLineStyle *linestyle;
@@ -119,7 +119,7 @@ FreestyleLineStyle *BKE_new_linestyle(const char *name,
struct Main *main)
return linestyle;
}
-void BKE_free_linestyle(FreestyleLineStyle *linestyle)
+void BKE_linestyle_free(FreestyleLineStyle *linestyle)
{
LineStyleModifier *m;
@@ -138,27 +138,27 @@ void BKE_free_linestyle(FreestyleLineStyle *linestyle)
BKE_free_animdata(&linestyle->id);
while ((m = (LineStyleModifier *)linestyle->color_modifiers.first))
- BKE_remove_linestyle_color_modifier(linestyle, m);
+ BKE_linestyle_modifier_remove_color(linestyle, m);
while ((m = (LineStyleModifier *)linestyle->alpha_modifiers.first))
- BKE_remove_linestyle_alpha_modifier(linestyle, m);
+ BKE_linestyle_modifier_remove_alpha(linestyle, m);
while ((m = (LineStyleModifier *)linestyle->thickness_modifiers.first))
- BKE_remove_linestyle_thickness_modifier(linestyle, m);
+ BKE_linestyle_modifier_remove_thickness(linestyle, m);
while ((m = (LineStyleModifier *)linestyle->geometry_modifiers.first))
- BKE_remove_linestyle_geometry_modifier(linestyle, m);
+ BKE_linestyle_modifier_remove_geometry(linestyle, m);
}
-FreestyleLineStyle *BKE_copy_linestyle(FreestyleLineStyle *linestyle)
+FreestyleLineStyle *BKE_linestyle_copy(FreestyleLineStyle *linestyle)
{
FreestyleLineStyle *new_linestyle;
LineStyleModifier *m;
int a;
- new_linestyle = BKE_new_linestyle(linestyle->id.name + 2, NULL);
- BKE_free_linestyle(new_linestyle);
+ new_linestyle = BKE_linestyle_new(linestyle->id.name + 2, NULL);
+ BKE_linestyle_free(new_linestyle);
for (a = 0; a < MAX_MTEX; a++) {
if (linestyle->mtex[a]) {
- new_linestyle->mtex[a] = MEM_mallocN(sizeof(MTex),
"BKE_copy_linestyle");
+ new_linestyle->mtex[a] = MEM_mallocN(sizeof(MTex),
"BKE_linestyle_copy");
memcpy(new_linestyle->mtex[a], linestyle->mtex[a],
sizeof(MTex));
id_us_plus((ID *)new_linestyle->mtex[a]->tex);
}
@@ -199,18 +199,18 @@ FreestyleLineStyle *BKE_copy_linestyle(FreestyleLineStyle
*linestyle)
new_linestyle->texstep = linestyle->texstep;
new_linestyle->pr_texture = linestyle->pr_texture;
for (m = (LineStyleModifier *)linestyle->color_modifiers.first; m; m =
m->next)
- BKE_copy_linestyle_color_modifier(new_linestyle, m);
+ BKE_linestyle_modifier_copy_color(new_linestyle, m);
for (m = (LineStyleModifier *)linestyle->alpha_modifiers.first; m; m =
m->next)
- BKE_copy_linestyle_alpha_modifier(new_linestyle, m);
+ BKE_linestyle_modifier_copy_alpha(new_linestyle, m);
for (m = (LineStyleModifier *)linestyle->thickness_modifiers.first; m;
m = m->next)
- BKE_copy_linestyle_thickness_modifier(new_linestyle, m);
+ BKE_linestyle_modifier_copy_thickness(new_linestyle, m);
for (m = (LineStyleModifier *)linestyle->geometry_modifiers.first; m; m
= m->next)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
