Merge branch 'master' into blender2.8

# Conflicts:
#	tests/gtests/alembic/abc_export_test.cc

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);
 	}
 };