[Bf-blender-cvs] [f884ba02a20] blender2.8: Merge branch 'master' into blender2.8

[Sybren A. Stüvel]

Commit: f884ba02a20a1c6f55e4b0c068ee19d8b5c6f078
Author: Sybren A. Stüvel
Date:   Wed Jun 6 15:58:18 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBf884ba02a20a1c6f55e4b0c068ee19d8b5c6f078

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/alembic/intern/abc_exporter.cc
index 093c4de085e,67575cb52d5..dbffcb46790
--- a/source/blender/alembic/intern/abc_exporter.cc
+++ b/source/blender/alembic/intern/abc_exporter.cc
@@@ -413,16 -407,15 +413,16 @@@ void AbcExporter::exploreTransform(Deps
  				dupli_ob = link->ob;
  				dupli_parent = (dupli_ob->parent) ? dupli_ob->parent : ob;
  
 -				exploreTransform(eval_ctx, dupli_ob, dupli_parent, ob);
 +				fake_base.object = dupli_ob;
 +				exploreTransform(depsgraph, &fake_base, dupli_parent, ob);
  			}
  		}
- 	}
  
- 	free_object_duplilist(lb);
+ 		free_object_duplilist(lb);
+ 	}
  }
  
 -AbcTransformWriter * AbcExporter::createTransformWriter(Object *ob, Object *parent, Object *dupliObParent)
 +AbcTransformWriter * AbcExporter::createTransformWriter(Depsgraph *depsgraph, Object *ob, Object *parent, Object *dupliObParent)
  {
  	/* An object should not be its own parent, or we'll get infinite loops. */
  	BLI_assert(ob != parent);
@@@ -522,14 -516,14 +522,14 @@@ void AbcExporter::exploreObject(Depsgra
  			if (m_settings.renderable_only && link->no_draw) {
  				continue;
  			}
 -
 -			if (link->type == OB_DUPLIGROUP) {
 -				exploreObject(eval_ctx, link->ob, ob);
 +			if (link->type == OB_DUPLICOLLECTION) {
 +				fake_base.object = link->ob;
 +				exploreObject(depsgraph, &fake_base, ob);
  			}
  		}
- 	}
  
- 	free_object_duplilist(lb);
+ 		free_object_duplilist(lb);
+ 	}
  }
  
  void AbcExporter::createParticleSystemsWriters(Object *ob, AbcTransformWriter *xform)