Merge branch 'master' into blender2.8
authorCampbell Barton <ideasman42@gmail.com>
Thu, 20 Sep 2018 00:11:01 +0000 (10:11 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 20 Sep 2018 00:11:01 +0000 (10:11 +1000)
1  2 
source/blender/alembic/intern/abc_points.cc

index 9ff995ffcbf6f29d6fd207e227f757cd5b36ed93,738adb4cd3ac53c5bf639a50995da589371a1c92..c748139a0e6bb5f2fe620253f8d9ae9ade60926f
@@@ -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;