diff options
author | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-04-06 13:07:27 +0300 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-04-16 20:55:33 +0300 |
commit | 34ab90f546f097cada951b2c9ca22bf271996980 (patch) | |
tree | ebcdb3d37120ac1d8fb16462b9104badd1800329 /source/blender/collada/collada.h | |
parent | 0c495005dd83913864acb510c1d4194a2275dbb0 (diff) |
Depsgraph: remove EvaluationContext, pass Depsgraph instead.
The depsgraph was always created within a fixed evaluation context. Passing
both risks the depsgraph and evaluation context not matching, and it
complicates the Python API where we'd have to expose both which is not so
easy to understand.
This also removes the global evaluation context in main, which assumed there
to be a single active scene and view layer.
Differential Revision: https://developer.blender.org/D3152
Diffstat (limited to 'source/blender/collada/collada.h')
-rw-r--r-- | source/blender/collada/collada.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/collada/collada.h b/source/blender/collada/collada.h index f95fca03b65..5cf526af1f2 100644 --- a/source/blender/collada/collada.h +++ b/source/blender/collada/collada.h @@ -41,9 +41,9 @@ extern "C" { #include "RNA_types.h" struct bContext; +struct Depsgraph; struct Scene; struct ViewLayer; -struct EvaluationContext; /* * both return 1 on success, 0 on error @@ -52,7 +52,7 @@ int collada_import(struct bContext *C, ImportSettings *import_settings); -int collada_export(struct EvaluationContext *eval_ctx, +int collada_export(struct Depsgraph *depsgraph, struct Scene *sce, ExportSettings *export_settings); |