diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-02-27 06:26:34 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-02-27 06:52:58 +0300 |
commit | 5520b8df4b578595afcfc074a1acb96359bce49c (patch) | |
tree | a14ab9f8047492364370370e7e40bfd2ac16bb49 /source/blender/editors | |
parent | 2a5e92c989d80d79d3eaf43202ee979a2dc88042 (diff) |
cleanup: double promotion
Diffstat (limited to 'source/blender/editors')
-rw-r--r-- | source/blender/editors/curve/editcurve.c | 2 | ||||
-rw-r--r-- | source/blender/editors/include/ED_curve.h | 2 | ||||
-rw-r--r-- | source/blender/editors/sculpt_paint/paint_image_proj.c | 8 |
3 files changed, 9 insertions, 3 deletions
diff --git a/source/blender/editors/curve/editcurve.c b/source/blender/editors/curve/editcurve.c index 4aeeaa87269..a4c071d88a7 100644 --- a/source/blender/editors/curve/editcurve.c +++ b/source/blender/editors/curve/editcurve.c @@ -234,6 +234,7 @@ static int isNurbsel_count(Curve *cu, Nurb *nu) /* ******************* PRINTS ********************* */ +#if 0 void printknots(Object *obedit) { ListBase *editnurb = object_editcurve_get(obedit); @@ -253,6 +254,7 @@ void printknots(Object *obedit) } } } +#endif /* ********************* Shape keys *************** */ diff --git a/source/blender/editors/include/ED_curve.h b/source/blender/editors/include/ED_curve.h index 58e64f30b05..27e9cad4fd5 100644 --- a/source/blender/editors/include/ED_curve.h +++ b/source/blender/editors/include/ED_curve.h @@ -90,7 +90,9 @@ bool ED_curve_active_center(struct Curve *cu, float center[3]); bool mouse_font(struct bContext *C, const int mval[2], bool extend, bool deselect, bool toggle); +#if 0 /* debug only */ void printknots(struct Object *obedit); +#endif #endif /* __ED_CURVE_H__ */ diff --git a/source/blender/editors/sculpt_paint/paint_image_proj.c b/source/blender/editors/sculpt_paint/paint_image_proj.c index b6de4465149..098f0d04d78 100644 --- a/source/blender/editors/sculpt_paint/paint_image_proj.c +++ b/source/blender/editors/sculpt_paint/paint_image_proj.c @@ -1320,7 +1320,7 @@ static float project_paint_uvpixel_mask( ca_mask = w[0] * ca1 + w[1] * ca2 + w[2] * ca3; ca_mask = curvemapping_evaluateF(ps->cavity_curve, 0, ca_mask); - CLAMP(ca_mask, 0.0, 1.0); + CLAMP(ca_mask, 0.0f, 1.0f); mask *= ca_mask; } @@ -2060,8 +2060,10 @@ static void project_bucket_clip_face( /* detect pathological case where face the three vertices are almost colinear in screen space. * mostly those will be culled but when flood filling or with smooth shading it's a possibility */ if (dist_squared_to_line_v2(v1coSS, v2coSS, v3coSS) < 0.5f || - dist_squared_to_line_v2(v2coSS, v3coSS, v1coSS) < 0.5f) + dist_squared_to_line_v2(v2coSS, v3coSS, v1coSS) < 0.5f) + { colinear = true; + } /* get the UV space bounding box */ inside_bucket_flag |= BLI_rctf_isect_pt_v(bucket_bounds, v1coSS); @@ -3271,7 +3273,7 @@ static void proj_paint_state_cavity_init(ProjPaintState *ps) mul_v3_fl(edges[a], 1.0f / counter[a]); normal_short_to_float_v3(no, mv->no); /* augment the diffe*/ - cavities[a] = saacos(10.0f * dot_v3v3(no, edges[a])) * M_1_PI; + cavities[a] = saacos(10.0f * dot_v3v3(no, edges[a])) * (float)M_1_PI; } else cavities[a] = 0.0; |