[Bf-blender-cvs] [654ee398ff0] blender2.8: Merge branch 'master' into blender2.8

[Sergey Sharybin]

Commit: 654ee398ff0e37f4d5f5c4df96b1d521e4796de4
Author: Sergey Sharybin
Date:   Thu Oct 26 12:49:57 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB654ee398ff0e37f4d5f5c4df96b1d521e4796de4

Merge branch 'master' into blender2.8

===================================================================



===================================================================

diff --cc tests/gtests/alembic/abc_export_test.cc
index 52ccbc1b93f,9f10a1959ce..41ea32950eb
--- a/tests/gtests/alembic/abc_export_test.cc
+++ b/tests/gtests/alembic/abc_export_test.cc
@@@ -33,14 -28,41 +33,42 @@@ public
  		AbcExporter::getFrameSet(nr_of_samples, frames);
  	}
  
 +	EvaluationContext eval_ctx;
  };
  
- 
- TEST(abc_export, TimeSamplesFullShutter) {
+ class AlembicExportTest : public testing::Test
+ {
+ protected:
  	ExportSettings settings;
- 	settings.frame_start = 31.0;
- 	settings.frame_end = 223.0;
+ 	Scene scene;
+ 	TestableAbcExporter *exporter;
+ 
+ 	virtual void SetUp()
+ 	{
+ 		settings.frame_start = 31.0;
+ 		settings.frame_end = 223.0;
+ 
+ 		/* Fake a 25 FPS scene with a nonzero base (because that's sometimes forgotten) */
+ 		scene.r.frs_sec = 50;
+ 		scene.r.frs_sec_base = 2;
+ 
+ 		exporter = NULL;
+ 	}
+ 
+ 	virtual void TearDown()
+ 	{
+ 		delete exporter;
+ 	}
+ 
+ 	// Call after setting up the settings.
+ 	void createExporter()
+ 	{
+ 		exporter = new TestableAbcExporter(&scene, "somefile.abc", settings);
+ 	}
+ };
+ 
+ 
+ TEST_F(AlembicExportTest, TimeSamplesFullShutter) {
  	settings.shutter_open = 0.0;
  	settings.shutter_close = 1.0;