From 27787549256410b6b2de1eca47a2719830af7f96 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Mon, 26 Aug 2019 11:20:52 +0200 Subject: Cleanp: fix compiler warnings --- source/blender/alembic/intern/abc_mesh.h | 8 ++++---- source/blender/alembic/intern/alembic_capi.cc | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'source/blender/alembic') diff --git a/source/blender/alembic/intern/abc_mesh.h b/source/blender/alembic/intern/abc_mesh.h index 77686a0204e..c15fb948e03 100644 --- a/source/blender/alembic/intern/abc_mesh.h +++ b/source/blender/alembic/intern/abc_mesh.h @@ -100,16 +100,16 @@ class AbcMeshReader : public AbcObjectReader { public: AbcMeshReader(const Alembic::Abc::IObject &object, ImportSettings &settings); - bool valid() const; + bool valid() const override; bool accepts_object_type(const Alembic::AbcCoreAbstract::ObjectHeader &alembic_header, const Object *const ob, - const char **err_str) const; - void readObjectData(Main *bmain, const Alembic::Abc::ISampleSelector &sample_sel); + const char **err_str) const override; + void readObjectData(Main *bmain, const Alembic::Abc::ISampleSelector &sample_sel) override; struct Mesh *read_mesh(struct Mesh *existing_mesh, const Alembic::Abc::ISampleSelector &sample_sel, int read_flag, - const char **err_str); + const char **err_str) override; bool topology_changed(Mesh *existing_mesh, const Alembic::Abc::ISampleSelector &sample_sel) override; diff --git a/source/blender/alembic/intern/alembic_capi.cc b/source/blender/alembic/intern/alembic_capi.cc index f7ba925530b..dc525e0c46c 100644 --- a/source/blender/alembic/intern/alembic_capi.cc +++ b/source/blender/alembic/intern/alembic_capi.cc @@ -984,7 +984,7 @@ bool ABC_mesh_topology_changed( { AbcObjectReader *abc_reader = get_abc_reader(reader, ob, err_str); if (abc_reader == NULL) { - return NULL; + return false; } ISampleSelector sample_sel = sample_selector_for_time(time); -- cgit v1.2.3