[Bf-blender-cvs] [9ba112e] alembic: Cleanup: quiet warnings

[Campbell Barton]

Commit: 9ba112eb8939a7fb91381a655412742e5ccee254
Author: Campbell Barton
Date:   Fri May 8 00:06:09 2015 +1000
Branches: alembic
https://developer.blender.org/rB9ba112eb8939a7fb91381a655412742e5ccee254

Cleanup: quiet warnings

===================================================================

M	source/blender/blenkernel/intern/cache_library.c
M	source/blender/bmesh/intern/bmesh_strands_conv.c
M	source/blender/editors/hair/hair_stroke.c
M	source/blender/editors/io/io_cache_library.c
M	source/blender/makesrna/intern/rna_cache_library.c
M	source/blender/pointcache/alembic/abc_particles.cpp

===================================================================

diff --git a/source/blender/blenkernel/intern/cache_library.c b/source/blender/blenkernel/intern/cache_library.c
index fd90588..d462346 100644
--- a/source/blender/blenkernel/intern/cache_library.c
+++ b/source/blender/blenkernel/intern/cache_library.c
@@ -848,7 +848,7 @@ bool BKE_cache_modifier_find_strands(DupliCache *dupcache, Object *ob, int hair_
 		return false;
 	
 	psys = BLI_findlink(&ob->particlesystem, hair_system);
-	if (!psys || !psys->part->type == PART_HAIR)
+	if (!psys || (psys->part->type != PART_HAIR))
 		return false;
 	
 	strands = NULL;
diff --git a/source/blender/bmesh/intern/bmesh_strands_conv.c b/source/blender/bmesh/intern/bmesh_strands_conv.c
index 263cdd0..f72d573 100644
--- a/source/blender/bmesh/intern/bmesh_strands_conv.c
+++ b/source/blender/bmesh/intern/bmesh_strands_conv.c
@@ -885,7 +885,7 @@ static void bm_make_particles(BMesh *bm, Object *ob, ParticleSystem *psys, struc
 void BM_strands_bm_from_psys(BMesh *bm, Object *ob, ParticleSystem *psys, struct DerivedMesh *emitter_dm,
                              const bool set_key, int act_key_nr)
 {
-	KeyBlock *actkey;
+	// KeyBlock *actkey;
 	float (*keyco)[3] = NULL;
 	int totvert, totedge;
 	
diff --git a/source/blender/editors/hair/hair_stroke.c b/source/blender/editors/hair/hair_stroke.c
index 38c1b86..aeb4609 100644
--- a/source/blender/editors/hair/hair_stroke.c
+++ b/source/blender/editors/hair/hair_stroke.c
@@ -212,7 +212,7 @@ bool hair_test_vertex_inside_lasso(HairViewData *viewdata, const int mcoords[][2
 typedef void (*VertexToolCb)(HairToolData *data, void *userdata, BMVert *v, float factor);
 
 /* apply tool directly to each vertex inside the filter area */
-static int hair_tool_apply_vertex(HairToolData *data, VertexToolCb cb, void *userdata)
+static int UNUSED_FUNCTION(hair_tool_apply_vertex)(HairToolData *data, VertexToolCb cb, void *userdata)
 {
 	Scene *scene = data->scene;
 	Brush *brush = data->settings->brush;
diff --git a/source/blender/editors/io/io_cache_library.c b/source/blender/editors/io/io_cache_library.c
index d444ee3..1478e1b 100644
--- a/source/blender/editors/io/io_cache_library.c
+++ b/source/blender/editors/io/io_cache_library.c
@@ -524,6 +524,7 @@ void CACHELIBRARY_OT_bake(wmOperatorType *ot)
 
 /* ========================================================================= */
 
+#if 0
 static void ui_item_nlabel(uiLayout *layout, const char *s, size_t len)
 {
 	char buf[256];
@@ -551,7 +552,7 @@ static void archive_info_labels(uiLayout *layout, const char *info)
 	ui_item_nlabel(layout, cur, linelen);
 }
 
-static uiBlock *UNUSED_FUNCTION(archive_info_popup_create)(bContext *C, ARegion *ar, void *arg)
+static uiBlock *archive_info_popup_create(bContext *C, ARegion *ar, void *arg)
 {
 	const char *info = arg;
 	uiBlock *block;
@@ -570,6 +571,7 @@ static uiBlock *UNUSED_FUNCTION(archive_info_popup_create)(bContext *C, ARegion
 	
 	return block;
 }
+#endif
 
 static void print_stream(void *UNUSED(userdata), const char *s)
 {
diff --git a/source/blender/makesrna/intern/rna_cache_library.c b/source/blender/makesrna/intern/rna_cache_library.c
index 8120b4c..e351eb5 100644
--- a/source/blender/makesrna/intern/rna_cache_library.c
+++ b/source/blender/makesrna/intern/rna_cache_library.c
@@ -308,9 +308,9 @@ static int rna_StrandsKeyCacheModifier_hair_system_poll(PointerRNA *ptr, Pointer
 
 static void rna_StrandsKeyCacheModifier_active_shape_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 {
+#if 0 // TODO
 	StrandsKeyCacheModifier *skmd = ptr->data;
 	
-#if 0 // TODO
 	if (scene->obedit == ob) {
 		/* exit/enter editmode to get new shape */
 		switch (ob->type) {
diff --git a/source/blender/pointcache/alembic/abc_particles.cpp b/source/blender/pointcache/alembic/abc_particles.cpp
index 6ffd1d1..fcc08fe 100644
--- a/source/blender/pointcache/alembic/abc_particles.cpp
+++ b/source/blender/pointcache/alembic/abc_particles.cpp
@@ -875,12 +875,13 @@ void AbcStrandsWriter::write_sample()
 	m_child_writer.write_sample();
 }
 
-
+#if 0
 #define PRINT_M3_FORMAT "((%.3f, %.3f, %.3f), (%.3f, %.3f, %.3f), (%.3f, %.3f, %.3f))"
 #define PRINT_M3_ARGS(m) (double)m[0][0], (double)m[0][1], (double)m[0][2], (double)m[1][0], (double)m[1][1], (double)m[1][2], (double)m[2][0], (double)m[2][1], (double)m[2][2]
 #define PRINT_M4_FORMAT "((%.3f, %.3f, %.3f, %.3f), (%.3f, %.3f, %.3f, %.3f), (%.3f, %.3f, %.3f, %.3f), (%.3f, %.3f, %.3f, %.3f))"
 #define PRINT_M4_ARGS(m) (double)m[0][0], (double)m[0][1], (double)m[0][2], (double)m[0][3], (double)m[1][0], (double)m[1][1], (double)m[1][2], (double)m[1][3], \
                          (double)m[2][0], (double)m[2][1], (double)m[2][2], (double)m[2][3], (double)m[3][0], (double)m[3][1], (double)m[3][2], (double)m[3][3]
+#endif
 
 AbcStrandsChildrenReader::AbcStrandsChildrenReader(StrandsChildren *strands) :
     m_strands(strands)