Merge branch 'master' into blender2.8

Conflicts:
	source/blender/alembic/intern/abc_exporter.h

1 files changed, 29 insertions, 0 deletions

diff --git a/source/blender/alembic/intern/abc_util.cc b/source/blender/alembic/intern/abc_util.cc
index 5b45dff4b7f..6b82bc2dee6 100644
--- a/source/blender/alembic/intern/abc_util.cc
+++ b/source/blender/alembic/intern/abc_util.cc
@@ -526,3 +526,32 @@ ScopeTimer::~ScopeTimer()
 {
 	fprintf(stderr, "%s: %fs\n", m_message, PIL_check_seconds_timer() - m_start);
 }
+
+/* ********************** */
+
+bool SimpleLogger::empty()
+{
+	return m_stream.tellp() == 0ul;
+}
+
+std::string SimpleLogger::str() const
+{
+	return m_stream.str();
+}
+
+void SimpleLogger::clear()
+{
+	m_stream.clear();
+	m_stream.str("");
+}
+
+std::ostringstream &SimpleLogger::stream()
+{
+	return m_stream;
+}
+
+std::ostream &operator<<(std::ostream &os, const SimpleLogger &logger)
+{
+	os << logger.str();
+	return os;
+}