Merge branch 'master' into blender2.8
[blender.git] / source / blender / alembic / intern / abc_points.cc
index 4c78f3e83c7e72cb6fd624f86d4cd30907ef8b4a..6602c7e5a855f17e6cf7126c697325e6063f714f 100644 (file)
@@ -36,7 +36,6 @@ extern "C" {
 #include "BKE_lattice.h"
 #include "BKE_mesh.h"
 #include "BKE_object.h"
 #include "BKE_lattice.h"
 #include "BKE_mesh.h"
 #include "BKE_object.h"
-#include "BKE_particle.h"
 #include "BKE_scene.h"
 
 #include "BLI_math.h"
 #include "BKE_scene.h"
 
 #include "BLI_math.h"
@@ -63,13 +62,15 @@ AbcPointsWriter::AbcPointsWriter(Scene *scene,
                                     AbcTransformWriter *parent,
                                     uint32_t time_sampling,
                                     ExportSettings &settings,
                                     AbcTransformWriter *parent,
                                     uint32_t time_sampling,
                                     ExportSettings &settings,
-                                    ParticleSystem *psys)
+                                    void *UNUSED(psys))
     : AbcObjectWriter(scene, ob, time_sampling, settings, parent)
 {
     : AbcObjectWriter(scene, ob, time_sampling, settings, parent)
 {
-       m_psys = psys;
+       m_psys = NULL; // = psys;
 
 
+#if 0
        OPoints points(parent->alembicXform(), psys->name, m_time_sampling);
        m_schema = points.getSchema();
        OPoints points(parent->alembicXform(), psys->name, m_time_sampling);
        m_schema = points.getSchema();
+#endif
 }
 
 void AbcPointsWriter::do_write()
 }
 
 void AbcPointsWriter::do_write()
@@ -77,7 +78,7 @@ void AbcPointsWriter::do_write()
        if (!m_psys) {
                return;
        }
        if (!m_psys) {
                return;
        }
-
+#if 0
        std::vector<Imath::V3f> points;
        std::vector<Imath::V3f> velocities;
        std::vector<float> widths;
        std::vector<Imath::V3f> points;
        std::vector<Imath::V3f> velocities;
        std::vector<float> widths;
@@ -134,6 +135,7 @@ void AbcPointsWriter::do_write()
        m_sample.setSelfBounds(bounds());
 
        m_schema.set(m_sample);
        m_sample.setSelfBounds(bounds());
 
        m_schema.set(m_sample);
+#endif
 }
 
 /* ************************************************************************** */
 }
 
 /* ************************************************************************** */