From 54aa834b7d7cd60544e5e56c962f64bd48a3c400 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@gmail.com>
Date: Sat, 28 Apr 2018 16:20:19 +0200
Subject: Cleanup: fix compiler warnings on macOS / clang.

---
 source/blender/alembic/intern/abc_exporter.cc | 3 +--
 source/blender/alembic/intern/abc_exporter.h  | 4 +---
 source/blender/alembic/intern/abc_transform.h | 1 -
 source/blender/alembic/intern/alembic_capi.cc | 5 +++--
 4 files changed, 5 insertions(+), 8 deletions(-)

(limited to 'source/blender/alembic')

diff --git a/source/blender/alembic/intern/abc_exporter.cc b/source/blender/alembic/intern/abc_exporter.cc
index 16c3f7f4e86..f06959762d5 100644
--- a/source/blender/alembic/intern/abc_exporter.cc
+++ b/source/blender/alembic/intern/abc_exporter.cc
@@ -168,7 +168,7 @@ static bool export_object(const ExportSettings * const settings, const Base * co
 
 /* ************************************************************************** */
 
-AbcExporter::AbcExporter(Main *bmain, Scene *scene, ViewLayer *view_layer,
+AbcExporter::AbcExporter(Main *bmain, Scene *scene,
                          Depsgraph *depsgraph,
                          const char *filename, ExportSettings &settings)
     : m_bmain(bmain)
@@ -177,7 +177,6 @@ AbcExporter::AbcExporter(Main *bmain, Scene *scene, ViewLayer *view_layer,
     , m_trans_sampling_index(0)
     , m_shape_sampling_index(0)
     , m_scene(scene)
-    , m_view_layer(view_layer)
     , m_depsgraph(depsgraph)
     , m_writer(NULL)
 {}
diff --git a/source/blender/alembic/intern/abc_exporter.h b/source/blender/alembic/intern/abc_exporter.h
index 0a32a28adca..c891824a114 100644
--- a/source/blender/alembic/intern/abc_exporter.h
+++ b/source/blender/alembic/intern/abc_exporter.h
@@ -93,7 +93,6 @@ class AbcExporter {
 	unsigned int m_trans_sampling_index, m_shape_sampling_index;
 
 	Scene *m_scene;
-	ViewLayer *m_view_layer;
 	Depsgraph *m_depsgraph;
 
 	ArchiveWriter *m_writer;
@@ -105,8 +104,7 @@ class AbcExporter {
 	std::vector<AbcObjectWriter *> m_shapes;
 
 public:
-	AbcExporter(Main *bmain, Scene *scene, ViewLayer *view_layer,
-	            Depsgraph *depsgraph,
+	AbcExporter(Main *bmain, Scene *scene, Depsgraph *depsgraph,
 	            const char *filename, ExportSettings &settings);
 	~AbcExporter();
 
diff --git a/source/blender/alembic/intern/abc_transform.h b/source/blender/alembic/intern/abc_transform.h
index ce4b28ea236..91420b28f93 100644
--- a/source/blender/alembic/intern/abc_transform.h
+++ b/source/blender/alembic/intern/abc_transform.h
@@ -37,7 +37,6 @@ class AbcTransformWriter : public AbcObjectWriter {
 	Alembic::Abc::M44d m_matrix;
 
 	bool m_is_animated;
-	bool m_visible;
 	bool m_inherits_xform;
 
 public:
diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc
index 75b4063f3c4..35877f9f5a8 100644
--- a/source/blender/alembic/intern/alembic_capi.cc
+++ b/source/blender/alembic/intern/alembic_capi.cc
@@ -264,8 +264,7 @@ static void export_startjob(void *customdata, short *stop, short *do_update, flo
 
 	try {
 		Scene *scene = data->scene;
-		ViewLayer *view_layer = data->view_layer;
-		AbcExporter exporter(data->bmain, scene, view_layer, data->depsgraph, data->filename, data->settings);
+		AbcExporter exporter(data->bmain, scene, data->depsgraph, data->filename, data->settings);
 
 		const int orig_frame = CFRA;
 
@@ -647,6 +646,7 @@ struct ImportJobData {
 	bool import_ok;
 };
 
+#if 0
 ABC_INLINE bool is_mesh_and_strands(const IObject &object)
 {
 	bool has_mesh = false;
@@ -677,6 +677,7 @@ ABC_INLINE bool is_mesh_and_strands(const IObject &object)
 
 	return has_mesh && has_curve;
 }
+#endif
 
 static void import_startjob(void *user_data, short *stop, short *do_update, float *progress)
 {
-- 
cgit v1.2.3