Merge branch 'master' into blender2.8

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

1 files changed, 3 insertions, 2 deletions

diff --git a/source/blender/alembic/intern/abc_exporter.cc b/source/blender/alembic/intern/abc_exporter.cc
index 9986db89131..ffe92c65587 100644
--- a/source/blender/alembic/intern/abc_exporter.cc
+++ b/source/blender/alembic/intern/abc_exporter.cc
@@ -66,6 +66,7 @@ using Alembic::Abc::OBox3dProperty;
 
 ExportSettings::ExportSettings()
     : scene(NULL)
+	, logger()
     , selected_only(false)
     , visible_layers_only(false)
     , renderable_only(false)
@@ -413,7 +414,7 @@ void AbcExporter::createTransformWriter(Object *ob, Object *parent, Object *dupl
 
 	/* check if we have already created a transform writer for this object */
 	if (getXForm(name) != NULL) {
-		std::cerr << "xform " << name << " already exists\n";
+		ABC_LOG(m_settings.logger) << "xform " << name << " already exists!\n";
 		return;
 	}
 
@@ -505,7 +506,7 @@ void AbcExporter::createShapeWriter(Base *ob_base, Object *dupliObParent)
 	AbcTransformWriter *xform = getXForm(name);
 
 	if (!xform) {
-		std::cerr << __func__ << ": xform " << name << " is NULL\n";
+		ABC_LOG(m_settings.logger) << __func__ << ": xform " << name << " is NULL\n";
 		return;
 	}