[Bf-blender-cvs] [35d044e40d5] blender2.8: Fix compilation error of alembic test after recent eval_ctx changes
Sergey Sharybin
noreply at git.blender.org
Mon Jul 24 16:51:04 CEST 2017
Commit: 35d044e40d578a93c7fe5ce78d58eacb03fc7e28
Author: Sergey Sharybin
Date: Mon Jul 24 16:50:47 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB35d044e40d578a93c7fe5ce78d58eacb03fc7e28
Fix compilation error of alembic test after recent eval_ctx changes
===================================================================
M tests/gtests/alembic/CMakeLists.txt
M tests/gtests/alembic/abc_export_test.cc
===================================================================
diff --git a/tests/gtests/alembic/CMakeLists.txt b/tests/gtests/alembic/CMakeLists.txt
index fadf549e212..924e7bbb1b6 100644
--- a/tests/gtests/alembic/CMakeLists.txt
+++ b/tests/gtests/alembic/CMakeLists.txt
@@ -27,6 +27,7 @@ set(INC
../../../source/blender/blenlib
../../../source/blender/alembic
../../../source/blender/makesdna
+ ../../../source/blender/depsgraph
${ALEMBIC_INCLUDE_DIRS}
${BOOST_INCLUDE_DIR}
${HDF5_INCLUDE_DIRS}
diff --git a/tests/gtests/alembic/abc_export_test.cc b/tests/gtests/alembic/abc_export_test.cc
index 63c1d179e51..52ccbc1b93f 100644
--- a/tests/gtests/alembic/abc_export_test.cc
+++ b/tests/gtests/alembic/abc_export_test.cc
@@ -10,11 +10,16 @@ extern "C" {
#include "DNA_scene_types.h"
}
+#include "DEG_depsgraph.h"
+
class TestableAbcExporter : public AbcExporter {
public:
TestableAbcExporter(Scene *scene, const char *filename, ExportSettings &settings)
- : AbcExporter(scene, filename, settings)
- {}
+ : AbcExporter(&eval_ctx, scene, filename, settings)
+ {
+ /* TODO(sergey): Pass scene layer somehow? */
+ DEG_evaluation_context_init(&eval_ctx, DAG_EVAL_VIEWPORT);
+ }
void getShutterSamples(unsigned int nr_of_samples,
bool time_relative,
@@ -28,6 +33,7 @@ public:
AbcExporter::getFrameSet(nr_of_samples, frames);
}
+ EvaluationContext eval_ctx;
};
More information about the Bf-blender-cvs
mailing list