diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-03-28 06:34:55 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-03-28 06:34:55 +0400 |
| commit | ac1cb5ee055840ba3481b8ad490e3be2a6a49cf2 (patch) | |
| tree | a24cd7905f6ab5e90d2926b822f9753598198e8f /source/blender/editors/mesh/editmesh_add.c | |
| parent | cf40220e54e32cf52931e461b928f26571fc2f4f (diff) | |
- quiet new warnings with gcc 4.6
- use BLI math funcs for normal float/short conversion.
- correct some un-intentional float/double promotions.
Diffstat (limited to 'source/blender/editors/mesh/editmesh_add.c')
| -rw-r--r-- | source/blender/editors/mesh/editmesh_add.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/editors/mesh/editmesh_add.c b/source/blender/editors/mesh/editmesh_add.c index 3a9859cefcb..bd094211270 100644 --- a/source/blender/editors/mesh/editmesh_add.c +++ b/source/blender/editors/mesh/editmesh_add.c @@ -1099,9 +1099,9 @@ static void make_prim(Object *obedit, int type, float mat[4][4], int tot, int se phi= 0; phid/=2; for(a=0; a<=tot; a++) { - vec[0]= dia*sin(phi); + vec[0]= dia*sinf(phi); vec[1]= 0.0; - vec[2]= dia*cos(phi); + vec[2]= dia*cosf(phi); eve= addvertlist(em, vec, NULL); eve->f= 1+2+4; if(a==0) v1= eve; @@ -1226,8 +1226,8 @@ static void make_prim(Object *obedit, int type, float mat[4][4], int tot, int se for(b=0; b<=ext; b++) { for(a=0; a<tot; a++) { - vec[0]= dia*sin(phi); - vec[1]= dia*cos(phi); + vec[0]= dia*sinf(phi); + vec[1]= dia*cosf(phi); vec[2]= b?depth:-depth; mul_m4_v3(mat, vec); |