Commit: d49eeabae7a001eaf18e39ca8e373f83798fbdff
Author: Campbell Barton
Date: Mon Mar 16 09:37:00 2015 +1100
Branches: master
https://developer.blender.org/rBd49eeabae7a001eaf18e39ca8e373f83798fbdff
Cleanup: warnings
===================================================================
M source/blender/blenkernel/intern/collision.c
M source/blender/bmesh/tools/bmesh_bevel.c
M source/blender/makesrna/intern/rna_mesh_api.c
===================================================================
diff --git a/source/blender/blenkernel/intern/collision.c
b/source/blender/blenkernel/intern/collision.c
index 6b8eac4..763024e 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 86b46c9..3c7a86a 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 a994bf5..abf29ef 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");
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
