[Bf-blender-cvs] [d7d41cb4595] temp-sybren-alembic-filestreams: DO NOT MERGE lots of debug prints
Sybren A. Stüvel
noreply at git.blender.org
Mon Jul 3 15:33:11 CEST 2017
Commit: d7d41cb45950686ae825e09c4febff3e4a5c1da4
Author: Sybren A. Stüvel
Date: Mon Jul 3 12:30:54 2017 +0200
Branches: temp-sybren-alembic-filestreams
https://developer.blender.org/rBd7d41cb45950686ae825e09c4febff3e4a5c1da4
DO NOT MERGE lots of debug prints
===================================================================
M source/blender/alembic/intern/abc_archive.cc
M source/blender/alembic/intern/abc_archive.h
M source/blender/alembic/intern/abc_mesh.cc
M source/blender/alembic/intern/alembic_capi.cc
M source/blender/blenkernel/intern/cachefile.c
===================================================================
diff --git a/source/blender/alembic/intern/abc_archive.cc b/source/blender/alembic/intern/abc_archive.cc
index 34e8c1a918a..368f6aec6b5 100644
--- a/source/blender/alembic/intern/abc_archive.cc
+++ b/source/blender/alembic/intern/abc_archive.cc
@@ -43,6 +43,7 @@ using Alembic::Abc::OArchive;
static IArchive open_archive(const std::string &filename,
bool &is_hdf5)
{
+ std::cerr << "abc_archive.cc:open_archive(" << filename << ")\n";
Alembic::AbcCoreAbstract::ReadArraySampleCachePtr cache_ptr;
is_hdf5 = false;
@@ -105,9 +106,14 @@ static IArchive open_archive(const std::string &filename,
ArchiveReader::ArchiveReader(const char *filename)
{
+ std::cerr << "ArchiveReader(" << filename << ") ← construction of " << this << "\n";
m_archive = open_archive(filename, m_is_hdf5);
}
+ArchiveReader::~ArchiveReader() {
+ std::cerr << "~ArchiveReader(): Closing " << this << "\n";
+}
+
bool ArchiveReader::is_hdf5() const
{
return m_is_hdf5;
diff --git a/source/blender/alembic/intern/abc_archive.h b/source/blender/alembic/intern/abc_archive.h
index e712e6f9dd6..9a51de26c8a 100644
--- a/source/blender/alembic/intern/abc_archive.h
+++ b/source/blender/alembic/intern/abc_archive.h
@@ -47,6 +47,7 @@ class ArchiveReader {
public:
explicit ArchiveReader(const char *filename);
+ ~ArchiveReader();
bool valid() const;
const std::string & fname() const { return filename; }
diff --git a/source/blender/alembic/intern/abc_mesh.cc b/source/blender/alembic/intern/abc_mesh.cc
index 9a4ca6f99a8..953c21da81e 100644
--- a/source/blender/alembic/intern/abc_mesh.cc
+++ b/source/blender/alembic/intern/abc_mesh.cc
@@ -1070,8 +1070,12 @@ DerivedMesh *AbcMeshReader::read_derivedmesh(DerivedMesh *dm,
int read_flag,
const char **err_str)
{
+ std::cerr << "AbcMeshReader(" << this
+ << "): IArchive " << m_iobject.getArchive().getPtr().get()
+ << " isValid=" << m_iobject.getArchive().valid()
+ << "\n";
const IPolyMeshSchema::Sample sample = m_schema.getValue(sample_sel);
-
+ std::cerr << " (schema read = ok)\n";
const P3fArraySamplePtr &positions = sample.getPositions();
const Alembic::Abc::Int32ArraySamplePtr &face_indices = sample.getFaceIndices();
const Alembic::Abc::Int32ArraySamplePtr &face_counts = sample.getFaceCounts();
diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc
index cd7f4180533..5a70f758201 100644
--- a/source/blender/alembic/intern/alembic_capi.cc
+++ b/source/blender/alembic/intern/alembic_capi.cc
@@ -181,6 +181,7 @@ static bool gather_objects_paths(const IObject &object, ListBase *object_paths)
AbcArchiveHandle *ABC_create_handle(const char *filename, ListBase *object_paths)
{
+ std::cerr << "ABC_create_handle: constructing new ArchiveReader(" << filename << ")\n";
ArchiveReader *archive = new ArchiveReader(filename);
if (!archive->valid()) {
@@ -866,6 +867,9 @@ bool ABC_import(bContext *C, const char *filepath, float scale, bool is_sequence
job->import_ok = false;
BLI_strncpy(job->filename, filepath, 1024);
+ std::cerr << "ABC_import sequence_len=" << sequence_len
+ << " offset=" << offset << "\n";
+
job->settings.scale = scale;
job->settings.is_sequence = is_sequence;
job->settings.set_frame_range = set_frame_range;
diff --git a/source/blender/blenkernel/intern/cachefile.c b/source/blender/blenkernel/intern/cachefile.c
index cf619a32783..5ebf7301353 100644
--- a/source/blender/blenkernel/intern/cachefile.c
+++ b/source/blender/blenkernel/intern/cachefile.c
@@ -126,9 +126,11 @@ void BKE_cachefile_reload(const Main *bmain, CacheFile *cache_file)
#ifdef WITH_ALEMBIC
if (cache_file->handle) {
+ printf("BKE_cachefile_reload: freeing %s\n", cache_file->filepath);
ABC_free_handle(cache_file->handle);
}
+ printf("BKE_cachefile_reload: loading again %s\n", cache_file->filepath);
cache_file->handle = ABC_create_handle(filepath, &cache_file->object_paths);
#endif
}
@@ -192,6 +194,8 @@ bool BKE_cachefile_filepath_get(
BLI_path_frame(r_filepath, frame, frame_len);
BLI_ensure_extension(r_filepath, FILE_MAX, ext);
+ printf("BKE_cachefile_filepath_get: path=%s\n", r_filepath);
+
/* TODO(kevin): store sequence range? */
return BLI_exists(r_filepath);
}
More information about the Bf-blender-cvs
mailing list