[Bf-blender-cvs] [e36ecb8a665] blender2.8: Alembic unit tests: fixed compiler errors

Sybren A. Stüvel noreply at git.blender.org
Fri Jun 8 14:49:44 CEST 2018


Commit: e36ecb8a66574ccbed5d6888b5d4c8bbc197029f
Author: Sybren A. Stüvel
Date:   Fri Jun 8 14:48:26 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBe36ecb8a66574ccbed5d6888b5d4c8bbc197029f

Alembic unit tests: fixed compiler errors

This doesn't mean the code is correct, but at least it builds.

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

M	tests/gtests/alembic/abc_export_test.cc

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

diff --git a/tests/gtests/alembic/abc_export_test.cc b/tests/gtests/alembic/abc_export_test.cc
index dab1e3ae040..c950084ef64 100644
--- a/tests/gtests/alembic/abc_export_test.cc
+++ b/tests/gtests/alembic/abc_export_test.cc
@@ -16,9 +16,8 @@ extern "C" {
 class TestableAbcExporter : public AbcExporter {
 public:
 	TestableAbcExporter(Main *bmain,
-	                    Scene *scene, Depsgraph *depsgraph,
 	                    const char *filename, ExportSettings &settings)
-	    : AbcExporter(bmain, scene, depsgraph, filename, settings)
+	    : AbcExporter(bmain, filename, settings)
 	{
 	}
 
@@ -57,7 +56,10 @@ protected:
 
 		/* TODO(sergey): Pass scene layer somehow? */
 		ViewLayer *view_layer = (ViewLayer *)scene.view_layers.first;
-		depsgraph = DEG_graph_new(&scene, view_layer, DAG_EVAL_VIEWPORT);
+		settings.depsgraph = depsgraph = DEG_graph_new(&scene, view_layer, DAG_EVAL_VIEWPORT);
+
+		settings.scene = &scene;
+		settings.view_layer = view_layer;
 
 		exporter = NULL;
 	}
@@ -72,7 +74,7 @@ protected:
 	// Call after setting up the settings.
 	void createExporter()
 	{
-		exporter = new TestableAbcExporter(bmain, &scene, depsgraph, "somefile.abc", settings);
+		exporter = new TestableAbcExporter(bmain, "somefile.abc", settings);
 	}
 };



More information about the Bf-blender-cvs mailing list