diff options
| author | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2020-12-06 08:25:57 +0300 |
|---|---|---|
| committer | Kévin Dietrich <kevin.dietrich@mailoo.org> | 2020-12-06 08:25:57 +0300 |
| commit | 9c4bbdc1cb7b12127fbd16d4ad9eb3a776010f6f (patch) | |
| tree | be9b1921825c9165335c3c14db25b007373b63b4 /source/blender/io/alembic | |
| parent | f46023d82ae58a9abac6498b692fbe2e0d90285f (diff) | |
| parent | 538f41e949de1180b293eade11d2899354c0f6e9 (diff) | |
Merge branch 'master' into cycles_procedural_api
Diffstat (limited to 'source/blender/io/alembic')
| -rw-r--r-- | source/blender/io/alembic/exporter/abc_subdiv_disabler.cc | 2 | ||||
| -rw-r--r-- | source/blender/io/alembic/tests/abc_export_test.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/io/alembic/exporter/abc_subdiv_disabler.cc b/source/blender/io/alembic/exporter/abc_subdiv_disabler.cc index 334a26df784..8073e157c13 100644 --- a/source/blender/io/alembic/exporter/abc_subdiv_disabler.cc +++ b/source/blender/io/alembic/exporter/abc_subdiv_disabler.cc @@ -18,7 +18,7 @@ */ #include "abc_subdiv_disabler.h" -#include <stdio.h> +#include <cstdio> #include "BLI_listbase.h" diff --git a/source/blender/io/alembic/tests/abc_export_test.cc b/source/blender/io/alembic/tests/abc_export_test.cc index e1a9bd34f6b..e20fe2ff492 100644 --- a/source/blender/io/alembic/tests/abc_export_test.cc +++ b/source/blender/io/alembic/tests/abc_export_test.cc @@ -23,7 +23,7 @@ class AlembicExportTest : public testing::Test { Depsgraph *depsgraph; Main *bmain; - virtual void SetUp() + void SetUp() override { abc_archive = nullptr; @@ -41,7 +41,7 @@ class AlembicExportTest : public testing::Test { depsgraph = DEG_graph_new(bmain, &scene, view_layer, DAG_EVAL_RENDER); } - virtual void TearDown() + void TearDown() override { BKE_main_free(bmain); DEG_graph_free(depsgraph); |