[Bf-blender-cvs] [264e800] alembic: Alembic: Quick fixes for strict compiler flags
Sergey Sharybin
noreply at git.blender.org
Tue May 5 18:55:04 CEST 2015
Commit: 264e8009655795c0133b0243588129bddd92d1c9
Author: Sergey Sharybin
Date: Tue May 5 21:54:43 2015 +0500
Branches: alembic
https://developer.blender.org/rB264e8009655795c0133b0243588129bddd92d1c9
Alembic: Quick fixes for strict compiler flags
===================================================================
M source/blender/bmesh/intern/bmesh_strands_conv.c
M source/blender/editors/include/ED_util.h
M source/blender/physics/intern/strands.cpp
===================================================================
diff --git a/source/blender/bmesh/intern/bmesh_strands_conv.c b/source/blender/bmesh/intern/bmesh_strands_conv.c
index 43b840b..fc3524c 100644
--- a/source/blender/bmesh/intern/bmesh_strands_conv.c
+++ b/source/blender/bmesh/intern/bmesh_strands_conv.c
@@ -805,6 +805,8 @@ static void bm_make_particles(BMesh *bm, Object *ob, ParticleSystem *psys, struc
}
}
}
+#else
+ (void)cd_shape_keyindex_offset;
#endif
vindex += 1;
@@ -871,6 +873,8 @@ void BM_strands_bm_from_psys(BMesh *bm, Object *ob, ParticleSystem *psys, struct
actkey = bm_set_shapekey_from_psys(bm, psys, totvert, act_key_nr);
if (actkey)
keyco = actkey->data;
+#else
+ (void)act_key_nr;
#endif
CustomData_bmesh_init_pool(&bm->vdata, totvert, BM_VERT);
diff --git a/source/blender/editors/include/ED_util.h b/source/blender/editors/include/ED_util.h
index ba5449e..c46780a 100644
--- a/source/blender/editors/include/ED_util.h
+++ b/source/blender/editors/include/ED_util.h
@@ -32,6 +32,8 @@
#define __ED_UTIL_H__
struct bContext;
+struct PackedFile;
+struct SpaceLink;
struct wmOperator;
struct wmOperatorType;
diff --git a/source/blender/physics/intern/strands.cpp b/source/blender/physics/intern/strands.cpp
index 4a5c48e..ad2a43a 100644
--- a/source/blender/physics/intern/strands.cpp
+++ b/source/blender/physics/intern/strands.cpp
@@ -217,7 +217,7 @@ static int strand_find_ik_targets(BMVert *root, IKTarget *targets)
return index;
}
-static void calc_jacobian_entry(Object *ob, BMEditStrands *edit, IKTarget *target, int index_target, int index_angle,
+static void calc_jacobian_entry(Object *ob, BMEditStrands * /*edit*/, IKTarget *target, int index_target, int index_angle,
const float point[3], const float axis1[3], const float axis2[3], MatrixX &J)
{
float (*obmat)[4] = ob->obmat;
@@ -300,7 +300,7 @@ static MatrixX strand_calc_target_jacobian(Object *ob, BMEditStrands *edit, BMVe
return J;
}
-static VectorX strand_angles_to_loc(Object *ob, BMEditStrands *edit, BMVert *root, int numjoints, const VectorX &angles)
+static VectorX strand_angles_to_loc(Object * /*ob*/, BMEditStrands *edit, BMVert *root, int numjoints, const VectorX &angles)
{
BMVert *v, *vprev;
BMIter iter_strand;
More information about the Bf-blender-cvs
mailing list