diff options
| author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-09-11 23:57:38 +0400 |
|---|---|---|
| committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2011-09-11 23:57:38 +0400 |
| commit | 6be21a91253a823f33060d354333b886c1b95b0a (patch) | |
| tree | dcadcea96beebac71694307edb7fbe2c581c3dd9 /source/blender/blenkernel/intern/linestyle.c | |
| parent | f045c18a78ba44b6b4144bf40af1d872ec898fda (diff) | |
Implemented a calligraphic thickness modifier in the Parameter Editor mode.
Also fixed a typo in the docstring of the CalligraphicShader.
Diffstat (limited to 'source/blender/blenkernel/intern/linestyle.c')
| -rw-r--r-- | source/blender/blenkernel/intern/linestyle.c | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/linestyle.c b/source/blender/blenkernel/intern/linestyle.c index f36bdaf487f..88584633a49 100644 --- a/source/blender/blenkernel/intern/linestyle.c +++ b/source/blender/blenkernel/intern/linestyle.c @@ -60,7 +60,8 @@ static char *modifier_name[LS_MODIFIER_NUM] = { "Perlin Noise 1D", "Perlin Noise 2D", "Backbone Stretcher", - "Tip Remover"}; + "Tip Remover", + "Calligraphy"}; static void default_linestyle_settings(FreestyleLineStyle *linestyle) { @@ -286,6 +287,9 @@ int FRS_add_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, int type case LS_MODIFIER_MATERIAL: size = sizeof(LineStyleThicknessModifier_Material); break; + case LS_MODIFIER_CALLIGRAPHY: + size = sizeof(LineStyleThicknessModifier_Calligraphy); + break; default: return -1; /* unknown modifier type */ } @@ -320,6 +324,11 @@ int FRS_add_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, int type ((LineStyleThicknessModifier_Material *)m)->value_min = 0.0f; ((LineStyleThicknessModifier_Material *)m)->value_max = 1.0f; break; + case LS_MODIFIER_CALLIGRAPHY: + ((LineStyleThicknessModifier_Calligraphy *)m)->min_thickness = 1.0f; + ((LineStyleThicknessModifier_Calligraphy *)m)->max_thickness = 10.0f; + ((LineStyleThicknessModifier_Calligraphy *)m)->orientation = 60.0f; + break; } add_to_modifier_list(&linestyle->thickness_modifiers, m); @@ -341,6 +350,8 @@ void FRS_remove_linestyle_thickness_modifier(FreestyleLineStyle *linestyle, Line case LS_MODIFIER_MATERIAL: curvemapping_free(((LineStyleThicknessModifier_Material *)m)->curve); break; + case LS_MODIFIER_CALLIGRAPHY: + break; } BLI_freelinkN(&linestyle->thickness_modifiers, m); } |