[Bf-blender-cvs] [341e524835c] temp-sybren-alembic-filestreams: DO NOT MERGE debug prints

Sybren A. Stüvel noreply at git.blender.org
Mon Jul 3 15:33:09 CEST 2017


Commit: 341e524835c989eb00704da849c1e689e8124d2b
Author: Sybren A. Stüvel
Date:   Mon Jul 3 15:28:25 2017 +0200
Branches: temp-sybren-alembic-filestreams
https://developer.blender.org/rB341e524835c989eb00704da849c1e689e8124d2b

DO NOT MERGE debug prints

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

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

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

diff --git a/source/blender/alembic/intern/abc_archive.h b/source/blender/alembic/intern/abc_archive.h
index 2454ef2442b..e712e6f9dd6 100644
--- a/source/blender/alembic/intern/abc_archive.h
+++ b/source/blender/alembic/intern/abc_archive.h
@@ -49,6 +49,7 @@ public:
 	explicit ArchiveReader(const char *filename);
 
 	bool valid() const;
+	const std::string & fname() const { return filename; }
 
 	/**
 	 * Returns true when either Blender is compiled with HDF5 support and
diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc
index 83d971d00d9..cd7f4180533 100644
--- a/source/blender/alembic/intern/alembic_capi.cc
+++ b/source/blender/alembic/intern/alembic_capi.cc
@@ -972,12 +972,14 @@ void CacheReader_incref(CacheReader *reader)
 CacheReader *CacheReader_open_alembic_object(AbcArchiveHandle *handle, CacheReader *reader, Object *object, const char *object_path)
 {
 	if (object_path[0] == '\0') {
+		std::cerr << "CacheReader_open_alembic_object(): returning " << reader << "\n";
 		return reader;
 	}
 
 	ArchiveReader *archive = archive_from_handle(handle);
 
 	if (!archive || !archive->valid()) {
+		std::cerr << "CacheReader_open_alembic_object(): returning " << reader << " because the archive doesn't exist or is invalid\n";
 		return reader;
 	}
 
@@ -985,10 +987,12 @@ CacheReader *CacheReader_open_alembic_object(AbcArchiveHandle *handle, CacheRead
 	find_iobject(archive->getTop(), iobject, object_path);
 
 	if (reader) {
+		std::cerr << "CacheReader_open_alembic_object(): freeing " << reader << "\n";
 		CacheReader_free(reader);
 	}
 
 	ImportSettings settings;
+	std::cerr << "CacheReader_open_alembic_object(): creating reader to replace " << reader << "\n";
 	AbcObjectReader *abc_reader = create_reader(iobject, settings);
 	abc_reader->object(object);
 	abc_reader->incref();




More information about the Bf-blender-cvs mailing list