diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-10-29 17:27:44 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-10-29 17:38:55 +0300 |
| commit | 405980b1facff4a76e3661a412eab1d072d0236f (patch) | |
| tree | 5ae5b79ac5bb91c2dc8d732531e7db4e67abee45 /tests/gtests | |
| parent | 7530c54c3cf38016d9038e6879c8ee2b1bd14c9e (diff) | |
| parent | 89eb05a8908130f8668e4c677d63f3d2b89e68bb (diff) | |
Merge branch 'master' into blender2.8
# Conflicts:
# source/blender/alembic/intern/abc_exporter.cc
# source/blender/alembic/intern/abc_exporter.h
# source/blender/alembic/intern/alembic_capi.cc
# tests/gtests/alembic/abc_export_test.cc
Diffstat (limited to 'tests/gtests')
| -rw-r--r-- | tests/gtests/alembic/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/gtests/alembic/abc_export_test.cc | 8 |
2 files changed, 6 insertions, 3 deletions
diff --git a/tests/gtests/alembic/CMakeLists.txt b/tests/gtests/alembic/CMakeLists.txt index 924e7bbb1b6..3e794898ebe 100644 --- a/tests/gtests/alembic/CMakeLists.txt +++ b/tests/gtests/alembic/CMakeLists.txt @@ -25,6 +25,7 @@ set(INC . .. ../../../source/blender/blenlib + ../../../source/blender/blenkernel ../../../source/blender/alembic ../../../source/blender/makesdna ../../../source/blender/depsgraph diff --git a/tests/gtests/alembic/abc_export_test.cc b/tests/gtests/alembic/abc_export_test.cc index 41ea32950eb..78622dcf8a0 100644 --- a/tests/gtests/alembic/abc_export_test.cc +++ b/tests/gtests/alembic/abc_export_test.cc @@ -5,6 +5,7 @@ #include "intern/abc_exporter.h" extern "C" { +#include "BKE_global.h" #include "BLI_utildefines.h" #include "BLI_math.h" #include "DNA_scene_types.h" @@ -14,8 +15,8 @@ extern "C" { class TestableAbcExporter : public AbcExporter { public: - TestableAbcExporter(Scene *scene, const char *filename, ExportSettings &settings) - : AbcExporter(&eval_ctx, scene, filename, settings) + TestableAbcExporter(Main *bmain, Scene *scene, const char *filename, ExportSettings &settings) + : AbcExporter(bmain, &eval_ctx, scene, filename, settings) { /* TODO(sergey): Pass scene layer somehow? */ DEG_evaluation_context_init(&eval_ctx, DAG_EVAL_VIEWPORT); @@ -42,6 +43,7 @@ protected: ExportSettings settings; Scene scene; TestableAbcExporter *exporter; + EvaluationContext eval_ctx; virtual void SetUp() { @@ -63,7 +65,7 @@ protected: // Call after setting up the settings. void createExporter() { - exporter = new TestableAbcExporter(&scene, "somefile.abc", settings); + exporter = new TestableAbcExporter(G.main, &scene, "somefile.abc", settings); } }; |