Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-08-26 12:20:52 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-08-26 12:27:04 +0300
commit27787549256410b6b2de1eca47a2719830af7f96 (patch)
tree23f3209a056b3d04365096ba7095201f601a6edd /source/blender/alembic
parentfd52dc58ddea642b7162b01538c0c6c48abb0507 (diff)
Cleanp: fix compiler warnings
Diffstat (limited to 'source/blender/alembic')
-rw-r--r--source/blender/alembic/intern/abc_mesh.h8
-rw-r--r--source/blender/alembic/intern/alembic_capi.cc2
2 files changed, 5 insertions, 5 deletions
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);