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

[Campbell Barton]

Commit: 83ac16d241f44e34d1d5d77641b44dab5e4c7401
Author: Campbell Barton
Date:   Thu Sep 20 10:11:01 2018 +1000
Branches: blender2.8
https://developer.blender.org/rB83ac16d241f44e34d1d5d77641b44dab5e4c7401

Merge branch 'master' into blender2.8

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



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

diff --cc source/blender/alembic/intern/abc_points.cc
index 9ff995ffcbf,738adb4cd3a..c748139a0e6
--- a/source/blender/alembic/intern/abc_points.cc
+++ b/source/blender/alembic/intern/abc_points.cc
@@@ -60,12 -58,13 +60,12 @@@ using Alembic::AbcGeom::OPointsSchema
  
  /* ************************************************************************** */
  
 -AbcPointsWriter::AbcPointsWriter(Scene *scene,
 -                                 Object *ob,
 +AbcPointsWriter::AbcPointsWriter(Object *ob,
- 	                             AbcTransformWriter *parent,
- 	                             uint32_t time_sampling,
- 	                             ExportSettings &settings,
- 	                             ParticleSystem *psys)
+                                  AbcTransformWriter *parent,
+                                  uint32_t time_sampling,
+                                  ExportSettings &settings,
+                                  ParticleSystem *psys)
 -    : AbcObjectWriter(scene, ob, time_sampling, settings, parent)
 +    : AbcObjectWriter(ob, time_sampling, settings, parent)
  {
  	m_psys = psys;