[Bf-blender-cvs] [8b4efc6] soc-2014-shapekey: Got rid of some more gcc warnings in own code
Grigory Revzin
noreply at git.blender.org
Sat Jun 21 00:05:45 CEST 2014
Commit: 8b4efc6283aebec11867d8a45a4222623cc55d3b
Author: Grigory Revzin
Date: Sat Jun 21 02:05:32 2014 +0400
https://developer.blender.org/rB8b4efc6283aebec11867d8a45a4222623cc55d3b
Got rid of some more gcc warnings in own code
===================================================================
M source/blender/blenloader/intern/writefile.c
M source/blender/editors/mesh/editmesh_utils.c
===================================================================
diff --git a/source/blender/blenloader/intern/writefile.c b/source/blender/blenloader/intern/writefile.c
index b17defb..78f8227 100644
--- a/source/blender/blenloader/intern/writefile.c
+++ b/source/blender/blenloader/intern/writefile.c
@@ -1614,7 +1614,7 @@ static void compress_kb(KeyBlock *kb, Key *key_owner)
if (G.debug_value == 1) {
printf("Compressed Shape Key %s, %.2f times smaller\n", kb->name,
- (rk->totelem * sizeof(float) * 3) / changed_verts * sizeof(KB_ComprMeshDataEnt));
+ (rk->totelem * sizeof(float) * 3.0f) / (changed_verts * sizeof(KB_ComprMeshDataEnt)));
}
}
else {
diff --git a/source/blender/editors/mesh/editmesh_utils.c b/source/blender/editors/mesh/editmesh_utils.c
index 221c1fd..a8c7362 100644
--- a/source/blender/editors/mesh/editmesh_utils.c
+++ b/source/blender/editors/mesh/editmesh_utils.c
@@ -493,12 +493,6 @@ void EDBM_flag_enable_all(BMEditMesh *em, const char hflag)
* The idea: detect if topology hadn't changed. If it had, run the heavy-duty tools from bmesh_mesh_conv.c.
*/
-static void shapekey_zero_warn(KeyBlock *kb)
-{
- /* TODO: raise a UI warning */
- printf("Warning: can't commit the scratch shape key: %s->value = 0.0\n", kb->name);
-}
-
static void update_bmesh_shapes(Object *ob)
{
Key *key = BKE_key_from_object(ob);
More information about the Bf-blender-cvs
mailing list