diff options
author | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-10 03:19:46 +0400 |
---|---|---|
committer | Tamito Kajiyama <rd6t-kjym@asahi-net.or.jp> | 2012-12-10 03:19:46 +0400 |
commit | 5083e0737f6413c63ab49b82735333534181d9b4 (patch) | |
tree | b21a7977e79ff5db7bc2c7f53471cc2f5ccf76bd /source/blender/blenkernel/intern/linestyle.c | |
parent | 3c4987f98378d44eda133311c65aa19412e4cd38 (diff) |
All angle properties were switched from degrees to radians (using PROP_ANGLE
RNA subtype), since Freestyle internally use angles in radians.
A patch set by Bastien Montagne (many thanks!)
NOTICE FOR BRANCH USERS:
This commit may break line drawing settings of already saved Freestyle files.
All angles are now treated as radians instead of degrees, so collections of
angle values might be necessary in order to recover previous visual results.
Affected properties are:
- Crease Angle in the edge detection options
- Min 2D Angle in the 'Splitting' section of a line style
- Max 2D Angle in the 'Splitting' section of a line style
- 'orientation' parameter of the Calligraphy thickness modifier
- 'angle' parameter of the PerlinNoise1D geometry modifier
- 'angle' parameter of the PerlinNoise2D geometry modifier
- 'angle' parameter of the 2DTransform geometry modifier
Diffstat (limited to 'source/blender/blenkernel/intern/linestyle.c')
-rw-r--r-- | source/blender/blenkernel/intern/linestyle.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/linestyle.c b/source/blender/blenkernel/intern/linestyle.c index 43a0daef80c..aa319ba67f2 100644 --- a/source/blender/blenkernel/intern/linestyle.c +++ b/source/blender/blenkernel/intern/linestyle.c @@ -47,6 +47,7 @@ #include "BKE_animsys.h" #include "BLI_blenlib.h" +#include "BLI_math.h" static const char *modifier_name[LS_MODIFIER_NUM] = { NULL, @@ -506,7 +507,7 @@ LineStyleModifier *FRS_add_linestyle_thickness_modifier(FreestyleLineStyle *line case LS_MODIFIER_CALLIGRAPHY: ((LineStyleThicknessModifier_Calligraphy *)m)->min_thickness = 1.0f; ((LineStyleThicknessModifier_Calligraphy *)m)->max_thickness = 10.0f; - ((LineStyleThicknessModifier_Calligraphy *)m)->orientation = 60.0f; + ((LineStyleThicknessModifier_Calligraphy *)m)->orientation = DEG2RADF(60.0f); break; default: return NULL; /* unknown modifier type */ @@ -683,13 +684,13 @@ LineStyleModifier *FRS_add_linestyle_geometry_modifier(FreestyleLineStyle *lines ((LineStyleGeometryModifier_PerlinNoise1D *)m)->frequency = 10.0; ((LineStyleGeometryModifier_PerlinNoise1D *)m)->amplitude = 10.0; ((LineStyleGeometryModifier_PerlinNoise1D *)m)->octaves = 4; - ((LineStyleGeometryModifier_PerlinNoise1D *)m)->angle = 45.0; + ((LineStyleGeometryModifier_PerlinNoise1D *)m)->angle = DEG2RADF(45.0f); break; case LS_MODIFIER_PERLIN_NOISE_2D: ((LineStyleGeometryModifier_PerlinNoise2D *)m)->frequency = 10.0; ((LineStyleGeometryModifier_PerlinNoise2D *)m)->amplitude = 10.0; ((LineStyleGeometryModifier_PerlinNoise2D *)m)->octaves = 4; - ((LineStyleGeometryModifier_PerlinNoise2D *)m)->angle = 45.0; + ((LineStyleGeometryModifier_PerlinNoise2D *)m)->angle = DEG2RADF(45.0f); break; case LS_MODIFIER_BACKBONE_STRETCHER: ((LineStyleGeometryModifier_BackboneStretcher *)m)->backbone_length = 10.0; @@ -721,7 +722,7 @@ LineStyleModifier *FRS_add_linestyle_geometry_modifier(FreestyleLineStyle *lines ((LineStyleGeometryModifier_2DTransform *)m)->pivot = LS_MODIFIER_2D_TRANSFORM_PIVOT_CENTER; ((LineStyleGeometryModifier_2DTransform *)m)->scale_x = 1.f; ((LineStyleGeometryModifier_2DTransform *)m)->scale_y = 1.f; - ((LineStyleGeometryModifier_2DTransform *)m)->angle = 0.f; + ((LineStyleGeometryModifier_2DTransform *)m)->angle = DEG2RADF(0.0f); ((LineStyleGeometryModifier_2DTransform *)m)->pivot_u = 0.5f; ((LineStyleGeometryModifier_2DTransform *)m)->pivot_x = 0.f; ((LineStyleGeometryModifier_2DTransform *)m)->pivot_y = 0.f; |