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

[Campbell Barton]

Commit: 4dacda58f96d91fd4f358f418bf450bbc4bb3a43
Author: Campbell Barton
Date:   Mon Mar 13 07:51:10 2017 +1100
Branches: blender2.8
https://developer.blender.org/rB4dacda58f96d91fd4f358f418bf450bbc4bb3a43

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/alembic/intern/abc_exporter.cc
index 45c31279b50,61e7712150f..62e779e7fd6
--- a/source/blender/alembic/intern/abc_exporter.cc
+++ b/source/blender/alembic/intern/abc_exporter.cc
@@@ -341,11 -341,13 +341,11 @@@ void AbcExporter::operator()(Main *bmai
  
  void AbcExporter::createTransformWritersHierarchy(EvaluationContext *eval_ctx)
  {
- 	for(Base *base = static_cast<Base *>(m_settings.sl->object_bases.first); base; base = base->next) {
 -	Base *base = static_cast<Base *>(m_scene->base.first);
 -
 -	while (base) {
++	for (Base *base = static_cast<Base *>(m_settings.sl->object_bases.first); base; base = base->next) {
  		Object *ob = base->object;
  
 -		if (export_object(&m_settings, ob)) {
 +		if (export_object(&m_settings, base)) {
- 			switch(ob->type) {
+ 			switch (ob->type) {
  				case OB_LAMP:
  				case OB_LATTICE:
  				case OB_MBALL:
@@@ -362,10 -366,12 +362,10 @@@
  
  void AbcExporter::createTransformWritersFlat()
  {
- 	for(Base *base = static_cast<Base *>(m_settings.sl->object_bases.first); base; base = base->next) {
 -	Base *base = static_cast<Base *>(m_scene->base.first);
 -
 -	while (base) {
++	for (Base *base = static_cast<Base *>(m_settings.sl->object_bases.first); base; base = base->next) {
  		Object *ob = base->object;
  
 -		if (export_object(&m_settings, ob) && object_is_shape(ob)) {
 +		if (!export_object(&m_settings, base)) {
  			std::string name = get_id_name(ob);
  			m_xforms[name] = new AbcTransformWriter(ob, m_writer->archive().getTop(), 0, m_trans_sampling_index, m_settings);
  		}
@@@ -454,8 -460,13 +454,8 @@@ void AbcExporter::createTransformWriter
  
  void AbcExporter::createShapeWriters(EvaluationContext *eval_ctx)
  {
- 	for(Base *base = static_cast<Base *>(m_settings.sl->object_bases.first); base; base = base->next) {
 -	Base *base = static_cast<Base *>(m_scene->base.first);
 -
 -	while (base) {
 -		Object *ob = base->object;
 -		exploreObject(eval_ctx, ob, NULL);
 -
 -		base = base->next;
++	for (Base *base = static_cast<Base *>(m_settings.sl->object_bases.first); base; base = base->next) {
 +		exploreObject(eval_ctx, base, NULL);
  	}
  }