[Bf-blender-cvs] [175e48d] alembic_basic_io: Remove unused function.

Kévin Dietrich noreply at git.blender.org
Sun Mar 27 23:31:11 CEST 2016


Commit: 175e48d76308f505a4ed2c8ed2ef015baa2a977f
Author: Kévin Dietrich
Date:   Sun Mar 27 21:23:36 2016 +0200
Branches: alembic_basic_io
https://developer.blender.org/rB175e48d76308f505a4ed2c8ed2ef015baa2a977f

Remove unused function.

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

M	source/blender/alembic/ABC_alembic.h
M	source/blender/alembic/intern/alembic_capi.cc

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

diff --git a/source/blender/alembic/ABC_alembic.h b/source/blender/alembic/ABC_alembic.h
index a274c9f..bfcef72 100644
--- a/source/blender/alembic/ABC_alembic.h
+++ b/source/blender/alembic/ABC_alembic.h
@@ -54,7 +54,6 @@ int ABC_export(struct Scene *sce, const char *filename,
 				bool packuv
 				);
 
-struct DerivedMesh *abcGetDerivedMesh(const char* filepath, float time, void* mesh_data, struct Object* ob, int assign_mat, const char* sub_obj);
 void 			abcGetVertexCache(const char* filepath, float time, void *key, void* verts, int max_verts, const char* sub_obj, int is_mvert);
 struct Mesh *abcGetMesh(const char* filepath, float time, void *key, int assign_mats, const char* sub_obj, bool *p_only);
 struct Curve *abcGetNurbs(const char* filepath, float time, const char* sub_obj);
diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc
index c3dccec..d09fa5d 100644
--- a/source/blender/alembic/intern/alembic_capi.cc
+++ b/source/blender/alembic/intern/alembic_capi.cc
@@ -996,7 +996,6 @@ void abcApplyMaterials(Object *ob, void *key)
 	// Clean up slots
 	while (object_remove_material_slot(ob));
 
-
 	bool can_assign = true;
 	std::map<std::string, int>::iterator it = meshmap.mat_map.begin();
 	int matcount = 0;
@@ -1031,24 +1030,6 @@ void abcApplyMaterials(Object *ob, void *key)
 	}
 }
 
-DerivedMesh *abcGetDerivedMesh(const char *filepath, float time, void *key, Object *ob, int assign_mats, const char *sub_obj)
-{
-	DerivedMesh *dm;
-	Mesh *mesh;
-	bool p_only = true;
-
-	mesh = abcGetMesh(filepath, time, key, assign_mats, sub_obj, &p_only);
-
-	dm = CDDM_from_mesh(mesh);
-
-	if (!p_only && assign_mats) {
-		abcApplyMaterials(ob, key);
-
-	}
-
-	return dm;
-}
-
 void abcGetVertexCache(const char *filepath, float time, void *key, void *verts, int max_verts, const char *sub_obj, int is_mverts)
 {
 	std::string file_path = filepath;




More information about the Bf-blender-cvs mailing list