[Bf-blender-cvs] [dbb3e8d] gooseberry: Gooseberry: Previous commit broke compilation of debug builds
Sergey Sharybin
noreply at git.blender.org
Mon Jun 8 16:31:26 CEST 2015
Commit: dbb3e8da3e3b91528f602e244e739a71d76f4ff1
Author: Sergey Sharybin
Date: Mon Jun 8 16:30:35 2015 +0200
Branches: gooseberry
https://developer.blender.org/rBdbb3e8da3e3b91528f602e244e739a71d76f4ff1
Gooseberry: Previous commit broke compilation of debug builds
===================================================================
M source/blender/blenkernel/intern/mesh_sample.c
===================================================================
diff --git a/source/blender/blenkernel/intern/mesh_sample.c b/source/blender/blenkernel/intern/mesh_sample.c
index 952e344..b1a89ec 100644
--- a/source/blender/blenkernel/intern/mesh_sample.c
+++ b/source/blender/blenkernel/intern/mesh_sample.c
@@ -99,10 +99,12 @@ bool BKE_mesh_sample_eval(DerivedMesh *dm, const MSurfaceSample *sample, float l
return true;
}
-bool BKE_mesh_sample_shapekey(Key *UNUSED(key), KeyBlock *kb, const MSurfaceSample *sample, float loc[3])
+bool BKE_mesh_sample_shapekey(Key *key, KeyBlock *kb, const MSurfaceSample *sample, float loc[3])
{
float *v1, *v2, *v3;
-
+
+ (void)key; /* Unused in release builds. */
+
BLI_assert(key->elemsize == 3 * sizeof(float));
BLI_assert(sample->orig_verts[0] < (unsigned int)kb->totelem);
BLI_assert(sample->orig_verts[1] < (unsigned int)kb->totelem);
More information about the Bf-blender-cvs
mailing list