diff options
author | Campbell Barton <ideasman42@gmail.com> | 2017-05-24 14:16:54 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2017-05-24 14:17:05 +0300 |
commit | a6c60affffc99270e94a123092d8b9c0942cccaa (patch) | |
tree | 19125fb8d6ecab8166d7773de57b341fbbc842d4 /source/blender/alembic/intern | |
parent | 60a099fb0958c1c0dd16f2800da6cac551e35c2c (diff) | |
parent | d252ac6b9528d60b1235e095888f91e202ac4399 (diff) |
Merge branch 'master' into blender2.8
Diffstat (limited to 'source/blender/alembic/intern')
-rw-r--r-- | source/blender/alembic/intern/abc_archive.cc | 3 | ||||
-rw-r--r-- | source/blender/alembic/intern/abc_curves.cc | 2 | ||||
-rw-r--r-- | source/blender/alembic/intern/abc_exporter.cc | 2 | ||||
-rw-r--r-- | source/blender/alembic/intern/abc_mesh.cc | 2 | ||||
-rw-r--r-- | source/blender/alembic/intern/abc_points.cc | 2 |
5 files changed, 7 insertions, 4 deletions
diff --git a/source/blender/alembic/intern/abc_archive.cc b/source/blender/alembic/intern/abc_archive.cc index 194a8224c62..ff14cf15124 100644 --- a/source/blender/alembic/intern/abc_archive.cc +++ b/source/blender/alembic/intern/abc_archive.cc @@ -24,6 +24,8 @@ #include "abc_archive.h" +#include "BKE_blender_version.h" + #ifdef WIN32 # include "utfconv.h" #endif @@ -143,6 +145,7 @@ static OArchive create_archive(std::ostream *ostream, { md.set(Alembic::Abc::kApplicationNameKey, "Blender"); md.set(Alembic::Abc::kUserDescriptionKey, scene_name); + md.set("blender_version", versionstr); time_t raw_time; time(&raw_time); diff --git a/source/blender/alembic/intern/abc_curves.cc b/source/blender/alembic/intern/abc_curves.cc index f54abd6563e..f73fe957fea 100644 --- a/source/blender/alembic/intern/abc_curves.cc +++ b/source/blender/alembic/intern/abc_curves.cc @@ -220,7 +220,7 @@ bool AbcCurveReader::accepts_object_type(const Alembic::AbcCoreAbstract::ObjectH return false; } - if (ob->type != OB_EMPTY) { + if (ob->type != OB_CURVE) { *err_str = "Object type mismatch, Alembic object path points to Curves."; return false; } diff --git a/source/blender/alembic/intern/abc_exporter.cc b/source/blender/alembic/intern/abc_exporter.cc index 2c2d0b598e9..d974509d0ae 100644 --- a/source/blender/alembic/intern/abc_exporter.cc +++ b/source/blender/alembic/intern/abc_exporter.cc @@ -585,7 +585,7 @@ void AbcExporter::createShapeWriter(Base *ob_base, Object *dupliObParent) { Mesh *me = static_cast<Mesh *>(ob->data); - if (!me || me->totvert == 0) { + if (!me) { return; } diff --git a/source/blender/alembic/intern/abc_mesh.cc b/source/blender/alembic/intern/abc_mesh.cc index 15a72cf4453..e398ebf0afb 100644 --- a/source/blender/alembic/intern/abc_mesh.cc +++ b/source/blender/alembic/intern/abc_mesh.cc @@ -354,7 +354,7 @@ bool AbcMeshWriter::isAnimated() const md = md->next; } - return false; + return me->adt != NULL; } void AbcMeshWriter::do_write() diff --git a/source/blender/alembic/intern/abc_points.cc b/source/blender/alembic/intern/abc_points.cc index 3a2ca8a1b47..80567cd6bf0 100644 --- a/source/blender/alembic/intern/abc_points.cc +++ b/source/blender/alembic/intern/abc_points.cc @@ -160,7 +160,7 @@ bool AbcPointsReader::accepts_object_type(const Alembic::AbcCoreAbstract::Object return false; } - if (ob->type != OB_EMPTY) { + if (ob->type != OB_MESH) { *err_str = "Object type mismatch, Alembic object path points to Points."; return false; } |