Commit: 4e5ee121af425007e54bf906daf8eba07f865000
Author: Lukas Tönne
Date: Fri Feb 27 15:32:27 2015 +0100
Branches: alembic_pointcache
https://developer.blender.org/rB4e5ee121af425007e54bf906daf8eba07f865000
Removed deprecated and unused alembic API functions.
These are now implemented as virtual functions in the Factor class.
===================================================================
M source/blender/pointcache/alembic/abc_cloth.cpp
M source/blender/pointcache/alembic/abc_mesh.cpp
M source/blender/pointcache/alembic/abc_particles.cpp
M source/blender/pointcache/alembic/abc_reader.cpp
M source/blender/pointcache/alembic/abc_writer.cpp
===================================================================
diff --git a/source/blender/pointcache/alembic/abc_cloth.cpp
b/source/blender/pointcache/alembic/abc_cloth.cpp
index 0637d45..f1dbff0 100644
--- a/source/blender/pointcache/alembic/abc_cloth.cpp
+++ b/source/blender/pointcache/alembic/abc_cloth.cpp
@@ -238,30 +238,4 @@ PTCReadSampleResult AbcClothReader::read_sample(float
frame)
return PTC_READ_SAMPLE_EXACT;
}
-/* ==== API ==== */
-
-Writer *abc_writer_cloth(WriterArchive *archive, const std::string &name,
Object *ob, ClothModifierData *clmd)
-{
- BLI_assert(dynamic_cast<AbcWriterArchive *>(archive));
- return new AbcClothWriter((AbcWriterArchive *)archive, name, ob, clmd);
-}
-
-Reader *abc_reader_cloth(ReaderArchive *archive, const std::string &name,
Object *ob, ClothModifierData *clmd)
-{
- BLI_assert(dynamic_cast<AbcReaderArchive *>(archive));
- return new AbcClothReader((AbcReaderArchive *)archive, name, ob, clmd);
-}
-
-Writer *abc_writer_hair_dynamics(WriterArchive *archive, const std::string
&name, Object *ob, ClothModifierData *clmd)
-{
- BLI_assert(dynamic_cast<AbcWriterArchive *>(archive));
- return new AbcHairDynamicsWriter((AbcWriterArchive *)archive, name, ob,
clmd);
-}
-
-Reader *abc_reader_hair_dynamics(ReaderArchive *archive, const std::string
&name, Object *ob, ClothModifierData *clmd)
-{
- BLI_assert(dynamic_cast<AbcReaderArchive *>(archive));
- return new AbcHairDynamicsReader((AbcReaderArchive *)archive, name, ob,
clmd);
-}
-
} /* namespace PTC */
diff --git a/source/blender/pointcache/alembic/abc_mesh.cpp
b/source/blender/pointcache/alembic/abc_mesh.cpp
index 3063562..9b11bac 100644
--- a/source/blender/pointcache/alembic/abc_mesh.cpp
+++ b/source/blender/pointcache/alembic/abc_mesh.cpp
@@ -578,30 +578,4 @@ PTCReadSampleResult
AbcDerivedMeshReader::read_sample(float frame)
return PTC_READ_SAMPLE_EXACT;
}
-/* ==== API ==== */
-
-Writer *abc_writer_derived_mesh(WriterArchive *archive, const std::string
&name, Object *ob, DerivedMesh **dm_ptr)
-{
- BLI_assert(dynamic_cast<AbcWriterArchive *>(archive));
- return new AbcDerivedMeshWriter((AbcWriterArchive *)archive, name, ob,
dm_ptr);
-}
-
-Reader *abc_reader_derived_mesh(ReaderArchive *archive, const std::string
&name, Object *ob)
-{
- BLI_assert(dynamic_cast<AbcReaderArchive *>(archive));
- return new AbcDerivedMeshReader((AbcReaderArchive *)archive, name, ob);
-}
-
-Writer *abc_writer_derived_final(WriterArchive *archive, const std::string
&name, Object *ob)
-{
- BLI_assert(dynamic_cast<AbcWriterArchive *>(archive));
- return new AbcDerivedFinalWriter((AbcWriterArchive *)archive, name, ob);
-}
-
-Writer *abc_writer_cache_modifier(WriterArchive *archive, const std::string
&name, Object *ob, CacheModifierData *cmd)
-{
- BLI_assert(dynamic_cast<AbcWriterArchive *>(archive));
- return new AbcCacheModifierWriter((AbcWriterArchive *)archive, name,
ob, cmd);
-}
-
} /* namespace PTC */
diff --git a/source/blender/pointcache/alembic/abc_particles.cpp
b/source/blender/pointcache/alembic/abc_particles.cpp
index b360384..e6b8756 100644
--- a/source/blender/pointcache/alembic/abc_particles.cpp
+++ b/source/blender/pointcache/alembic/abc_particles.cpp
@@ -449,42 +449,4 @@ PTCReadSampleResult
AbcParticlePathcacheReader::read_sample(float frame)
return PTC_READ_SAMPLE_EXACT;
}
-/* ==== API ==== */
-
-Writer *abc_writer_particles(WriterArchive *archive, const std::string &name,
Object *ob, ParticleSystem *psys)
-{
- BLI_assert(dynamic_cast<AbcWriterArchive *>(archive));
- return new AbcParticlesWriter((AbcWriterArchive *)archive, name, ob,
psys);
-}
-
-Reader *abc_reader_particles(ReaderArchive *archive, const std::string &name,
Object *ob, ParticleSystem *psys)
-{
- BLI_assert(dynamic_cast<AbcReaderArchive *>(archive));
- return new AbcParticlesReader((AbcReaderArchive *)archive, name, ob,
psys);
-}
-
-Writer *abc_writer_particle_pathcache_parents(WriterArchive *archive, const
std::string &name, Object *ob, ParticleSystem *psys)
-{
- BLI_assert(dynamic_cast<AbcWriterArchive *>(archive));
- return new AbcParticlePathcacheParentsWriter((AbcWriterArchive
*)archive, name, ob, psys);
-}
-
-Writer *abc_writer_particle_pathcache_children(WriterArchive *archive, const
std::string &name, Object *ob, ParticleSystem *psys)
-{
- BLI_assert(dynamic_cast<AbcWriterArchive *>(archive));
- return new AbcParticlePathcacheChildrenWriter((AbcWriterArchive
*)archive, name, ob, psys);
-}
-
-Reader *abc_reader_particle_pathcache_parents(ReaderArchive *archive, const
std::string &name, Object *ob, ParticleSystem *psys)
-{
- BLI_assert(dynamic_cast<AbcReaderArchive *>(archive));
- return new AbcParticlePathcacheParentsReader((AbcReaderArchive
*)archive, name, ob, psys);
-}
-
-Reader *abc_reader_particle_pathcache_children(ReaderArchive *archive, const
std::string &name, Object *ob, ParticleSystem *psys)
-{
- BLI_assert(dynamic_cast<AbcReaderArchive *>(archive));
- return new AbcParticlePathcacheChildrenReader((AbcReaderArchive
*)archive, name, ob, psys);
-}
-
} /* namespace PTC */
diff --git a/source/blender/pointcache/alembic/abc_reader.cpp
b/source/blender/pointcache/alembic/abc_reader.cpp
index c09969d..19c9e96 100644
--- a/source/blender/pointcache/alembic/abc_reader.cpp
+++ b/source/blender/pointcache/alembic/abc_reader.cpp
@@ -89,10 +89,4 @@ PTCReadSampleResult AbcReaderArchive::test_sample(float
frame)
}
}
-
-ReaderArchive *abc_reader_archive(Scene *scene, const std::string &filename,
ErrorHandler *error_handler)
-{
- return new AbcReaderArchive(scene, filename, error_handler);
-}
-
} /* namespace PTC */
diff --git a/source/blender/pointcache/alembic/abc_writer.cpp
b/source/blender/pointcache/alembic/abc_writer.cpp
index 6c6ca12..f2fbce4 100644
--- a/source/blender/pointcache/alembic/abc_writer.cpp
+++ b/source/blender/pointcache/alembic/abc_writer.cpp
@@ -66,10 +66,4 @@ TimeSamplingPtr AbcWriterArchive::frame_sampling()
return archive.getTimeSampling(m_frame_sampling);
}
-
-WriterArchive *abc_writer_archive(Scene *scene, const std::string &filename,
ErrorHandler *error_handler)
-{
- return new AbcWriterArchive(scene, filename, error_handler);
-}
-
} /* namespace PTC */
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
