Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix compilation error of alembic test after recent eval_ctx changes

Browse Source
This commit is contained in:
Sergey Sharybin
2017-07-24 16:50:47 +02:00
parent 34c2628f32
commit 35d044e40d
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
tests/gtests/alembic/CMakeLists.txt
View File

@@ -27,6 +27,7 @@ set(INC
../../../source/blender/blenlib ../../../source/blender/blenlib
../../../source/blender/alembic ../../../source/blender/alembic
../../../source/blender/makesdna ../../../source/blender/makesdna
../../../source/blender/depsgraph
${ALEMBIC_INCLUDE_DIRS} ${ALEMBIC_INCLUDE_DIRS}
${BOOST_INCLUDE_DIR} ${BOOST_INCLUDE_DIR}
${HDF5_INCLUDE_DIRS} ${HDF5_INCLUDE_DIRS}

10
tests/gtests/alembic/abc_export_test.cc
View File

@@ -10,11 +10,16 @@ extern "C" {
#include "DNA_scene_types.h" #include "DNA_scene_types.h"
} }
#include "DEG_depsgraph.h"
class TestableAbcExporter : public AbcExporter { class TestableAbcExporter : public AbcExporter {
public: public:
TestableAbcExporter(Scene *scene, const char *filename, ExportSettings &settings) 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, void getShutterSamples(unsigned int nr_of_samples,
bool time_relative, bool time_relative,
@@ -28,6 +33,7 @@ public:
AbcExporter::getFrameSet(nr_of_samples, frames); AbcExporter::getFrameSet(nr_of_samples, frames);
} }
EvaluationContext eval_ctx;
}; };