From 8a3728800cac83a0a9e524790ff46b7eca82cfbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 2 Nov 2017 14:33:13 +0100 Subject: [PATCH] Alembic: not using global in unit test. Thanks @sergey for pointing out this fix. --- tests/gtests/alembic/abc_export_test.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tests/gtests/alembic/abc_export_test.cc b/tests/gtests/alembic/abc_export_test.cc index a2761513d06..a3eb2c412df 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" } @@ -37,6 +37,7 @@ protected: ExportSettings settings; Scene scene; TestableAbcExporter *exporter; + Main *bmain; virtual void SetUp() { @@ -47,18 +48,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); } };