diff options
author | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-11-02 16:37:10 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2017-11-02 16:37:10 +0300 |
commit | f7d59fbc460cd2e544c855d8088c98aacf90cfdd (patch) | |
tree | 81ed5a9b6996845aee4ee48b3febf0c696f2f2be /tests/gtests/alembic/abc_export_test.cc | |
parent | 7eb4ef6cacbb4cf0fbc2ff01d2e1a5fa133072cf (diff) | |
parent | 8a3728800cac83a0a9e524790ff46b7eca82cfbd (diff) |
Merge branch 'master' into blender2.8
# Conflicts:
# tests/gtests/alembic/abc_export_test.cc
Diffstat (limited to 'tests/gtests/alembic/abc_export_test.cc')
-rw-r--r-- | tests/gtests/alembic/abc_export_test.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/tests/gtests/alembic/abc_export_test.cc b/tests/gtests/alembic/abc_export_test.cc index 78622dcf8a0..6fc976b8a55 100644 --- a/tests/gtests/alembic/abc_export_test.cc +++ b/tests/gtests/alembic/abc_export_test.cc @@ -5,8 +5,8 @@ #include "intern/abc_exporter.h" extern "C" { -#include "BKE_global.h" #include "BLI_utildefines.h" +#include "BKE_library.h" #include "BLI_math.h" #include "DNA_scene_types.h" } @@ -44,6 +44,7 @@ protected: Scene scene; TestableAbcExporter *exporter; EvaluationContext eval_ctx; + Main *bmain; virtual void SetUp() { @@ -54,18 +55,21 @@ protected: scene.r.frs_sec = 50; scene.r.frs_sec_base = 2; + bmain = BKE_main_new(); + exporter = NULL; } virtual void TearDown() { + BKE_main_free(bmain); delete exporter; } // Call after setting up the settings. void createExporter() { - exporter = new TestableAbcExporter(G.main, &scene, "somefile.abc", settings); + exporter = new TestableAbcExporter(bmain, &scene, "somefile.abc", settings); } }; |