diff options
| author | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2021-02-09 16:59:01 +0300 |
|---|---|---|
| committer | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2021-02-09 16:59:01 +0300 |
| commit | 3c9e83839716524ff49142f606849af1165a538d (patch) | |
| tree | ebbc68adfac247623f37bed8d2ab91c11179ff74 /source/blender/io/alembic | |
| parent | bdd14c1ff1a4142434e1da756d0c03ebebfb95fd (diff) | |
| parent | 5213b18eb2d57153e0e394190af1624401fed74b (diff) | |
Merge branch 'master' into cycles_procedural_api
Diffstat (limited to 'source/blender/io/alembic')
4 files changed, 4 insertions, 4 deletions
diff --git a/source/blender/io/alembic/exporter/abc_writer_mesh.h b/source/blender/io/alembic/exporter/abc_writer_mesh.h index fdf2d3cc1e3..ed4fb4e4514 100644 --- a/source/blender/io/alembic/exporter/abc_writer_mesh.h +++ b/source/blender/io/alembic/exporter/abc_writer_mesh.h @@ -32,7 +32,7 @@ namespace blender::io::alembic { /* Writer for Alembic geometry. Does not assume the object is a mesh object. */ class ABCGenericMeshWriter : public ABCAbstractWriter { private: - /* Either polymesh or subd is used, depending on is_subd_. + /* Either poly-mesh or subdivision-surface is used, depending on is_subd_. * References to the schema must be kept, or Alembic will not properly write. */ Alembic::AbcGeom::OPolyMesh abc_poly_mesh_; Alembic::AbcGeom::OPolyMeshSchema abc_poly_mesh_schema_; diff --git a/source/blender/io/alembic/exporter/abc_writer_transform.cc b/source/blender/io/alembic/exporter/abc_writer_transform.cc index 7fe9fd933c5..eff042d036d 100644 --- a/source/blender/io/alembic/exporter/abc_writer_transform.cc +++ b/source/blender/io/alembic/exporter/abc_writer_transform.cc @@ -94,7 +94,7 @@ void ABCTransformWriter::do_write(HierarchyContext &context) scale_mat[3][3] = args_.export_params->global_scale; /* also scale translation */ mul_m4_m4m4(parent_relative_matrix, parent_relative_matrix, scale_mat); parent_relative_matrix[3][3] /= - args_.export_params->global_scale; /* normalise the homogeneous component */ + args_.export_params->global_scale; /* Normalize the homogeneous component. */ } XformSample xform_sample; diff --git a/source/blender/io/alembic/intern/abc_reader_mesh.cc b/source/blender/io/alembic/intern/abc_reader_mesh.cc index 8e9c7f49c25..242790f264a 100644 --- a/source/blender/io/alembic/intern/abc_reader_mesh.cc +++ b/source/blender/io/alembic/intern/abc_reader_mesh.cc @@ -521,7 +521,7 @@ static bool has_animated_geom_params(const ICompoundProperty arbGeomParams) return false; } -/* Specialisation of has_animations() as defined in abc_reader_object.h. */ +/* Specialization of #has_animations() as defined in abc_reader_object.h. */ template<> bool has_animations(Alembic::AbcGeom::IPolyMeshSchema &schema, ImportSettings *settings) { if (settings->is_sequence || !schema.isConstant()) { diff --git a/source/blender/io/alembic/intern/abc_util.cc b/source/blender/io/alembic/intern/abc_util.cc index aa7beb37dc5..3d3ba0347c5 100644 --- a/source/blender/io/alembic/intern/abc_util.cc +++ b/source/blender/io/alembic/intern/abc_util.cc @@ -135,7 +135,7 @@ bool has_property(const Alembic::Abc::ICompoundProperty &prop, const std::string return prop.getPropertyHeader(name) != nullptr; } -typedef std::pair<Alembic::AbcCoreAbstract::index_t, float> index_time_pair_t; +using index_time_pair_t = std::pair<Alembic::AbcCoreAbstract::index_t, float>; float get_weight_and_index(float time, const Alembic::AbcCoreAbstract::TimeSamplingPtr &time_sampling, |