[Bf-blender-cvs] [6b05211] alembic_basic_io: Fix some compiler errors when building without alembic.

[Kévin Dietrich]

Commit: 6b052110596bc15a689bf5505da44212e4ff4b5d
Author: Kévin Dietrich
Date:   Mon May 23 14:53:59 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rB6b052110596bc15a689bf5505da44212e4ff4b5d

Fix some compiler errors when building without alembic.

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

M	source/blender/makesrna/intern/rna_modifier.c
M	source/blender/makesrna/intern/rna_scene_api.c
M	source/blender/modifiers/intern/MOD_meshcache_abc.c

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

diff --git a/source/blender/makesrna/intern/rna_modifier.c b/source/blender/makesrna/intern/rna_modifier.c
index 5c4c502..8f54f7a 100644
--- a/source/blender/makesrna/intern/rna_modifier.c
+++ b/source/blender/makesrna/intern/rna_modifier.c
@@ -4080,7 +4080,9 @@ static void rna_def_modifier_meshcache(BlenderRNA *brna)
 	static EnumPropertyItem prop_format_type_items[] = {
 		{MOD_MESHCACHE_TYPE_MDD, "MDD", 0, "MDD ", ""},
 		{MOD_MESHCACHE_TYPE_PC2, "PC2", 0, "PC2", ""},
+#ifdef WITH_ALEMBIC
 	    {MOD_MESHCACHE_TYPE_ABC, "ABC", 0, "Alembic", ""},
+#endif
 		{0, NULL, 0, NULL, NULL}
 	};
 
diff --git a/source/blender/makesrna/intern/rna_scene_api.c b/source/blender/makesrna/intern/rna_scene_api.c
index dd3c624..950c3b0 100644
--- a/source/blender/makesrna/intern/rna_scene_api.c
+++ b/source/blender/makesrna/intern/rna_scene_api.c
@@ -50,8 +50,10 @@
 #endif
 
 EnumPropertyItem rna_enum_abc_compression_items[] = {
+#ifdef WITH_ALEMBIC
 	{ ABC_ARCHIVE_OGAWA, "OGAWA", 0, "Ogawa", "" },
     { ABC_ARCHIVE_HDF5, "HDF5", 0, "HDF5", "" },
+#endif
 	{ 0, NULL, 0, NULL, NULL }
 };
 
diff --git a/source/blender/modifiers/intern/MOD_meshcache_abc.c b/source/blender/modifiers/intern/MOD_meshcache_abc.c
index 33e3c7f..b3e7cec 100644
--- a/source/blender/modifiers/intern/MOD_meshcache_abc.c
+++ b/source/blender/modifiers/intern/MOD_meshcache_abc.c
@@ -39,9 +39,14 @@ bool MOD_meshcache_read_abc_index(const char *filepath, const char *sub_object,
                                   const int index, const float factor,
                                   const char **err_str)
 {
+#ifdef WITH_ALEMBIC
     ABC_get_vertex_cache(filepath, factor, vertexCos, verts_tot, sub_object, 0);
+#else
+	UNUSED_VARS(filepath, factor, vertexCos, verts_tot, sub_object);
+#endif
 
 	UNUSED_VARS(index, err_str);
+
 	return true;
 }
 
@@ -58,9 +63,11 @@ bool MOD_meshcache_read_abc_times(const char *filepath, const char *sub_object,
                                   const float time, const float fps, const char time_mode,
                                   const char **err_str)
 {
+#ifdef WITH_ALEMBIC
 	if (!ABC_check_subobject_valid(filepath, sub_object)) {
 		return false;
 	}
+#endif
 
 	float frame;