diff options
author | Campbell Barton <ideasman42@gmail.com> | 2015-03-16 01:37:00 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2015-03-16 01:37:00 +0300 |
commit | d49eeabae7a001eaf18e39ca8e373f83798fbdff (patch) | |
tree | 75c88338f60ee6aa0b368b753f6b55c6d1403e59 | |
parent | 15374d31d59375b2cf88452fd2f93d63d51d101a (diff) |
Cleanup: warnings
-rw-r--r-- | source/blender/blenkernel/intern/collision.c | 2 | ||||
-rw-r--r-- | source/blender/bmesh/tools/bmesh_bevel.c | 2 | ||||
-rw-r--r-- | source/blender/makesrna/intern/rna_mesh_api.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/collision.c b/source/blender/blenkernel/intern/collision.c index 6b8eac44dfa..763024ec565 100644 --- a/source/blender/blenkernel/intern/collision.c +++ b/source/blender/blenkernel/intern/collision.c @@ -953,7 +953,7 @@ static bool cloth_points_collision_response_static(ClothModifierData *clmd, Coll float epsilon2 = BLI_bvhtree_getepsilon ( collmd->bvhtree ); for ( ; collpair != collision_end; collpair++ ) { - float margin_distance = collpair->distance - epsilon2; + float margin_distance = (float)(collpair->distance - (double)epsilon2); float impulse[3]; float mag_v_rel; diff --git a/source/blender/bmesh/tools/bmesh_bevel.c b/source/blender/bmesh/tools/bmesh_bevel.c index 86b46c900ec..3c7a86a332f 100644 --- a/source/blender/bmesh/tools/bmesh_bevel.c +++ b/source/blender/bmesh/tools/bmesh_bevel.c @@ -913,7 +913,7 @@ static void set_profile_params(BevelParams *bp, BevVert *bv, BoundVert *bndv) { EdgeHalf *e; Profile *pro; - float co1[3], co2[3], co3[3], d1[3], d2[3], d3[3], l; + float co1[3], co2[3], co3[3], d1[3], d2[3], l; bool do_linear_interp; copy_v3_v3(co1, bndv->nv.co); diff --git a/source/blender/makesrna/intern/rna_mesh_api.c b/source/blender/makesrna/intern/rna_mesh_api.c index a994bf5e9d1..abf29ef82a3 100644 --- a/source/blender/makesrna/intern/rna_mesh_api.c +++ b/source/blender/makesrna/intern/rna_mesh_api.c @@ -279,7 +279,7 @@ void RNA_api_mesh(StructRNA *srna) RNA_def_boolean(func, "free_mpoly", 0, "Free MPoly", "Free data used by polygons and loops. " "WARNING: This destructive operation removes regular faces, " "only used on temporary mesh data-blocks to reduce memory footprint of render " - "engines and export scripts."); + "engines and export scripts"); func = RNA_def_function(srna, "calc_smooth_groups", "rna_Mesh_calc_smooth_groups"); RNA_def_function_ui_description(func, "Calculate smooth groups from sharp edges"); |