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/depsgraph/DEG_depsgraph.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/depsgraph/DEG_depsgraph.h')
-rw-r--r-- | source/blender/depsgraph/DEG_depsgraph.h | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/source/blender/depsgraph/DEG_depsgraph.h b/source/blender/depsgraph/DEG_depsgraph.h index 4760c88cdbd..b30c99cbc0e 100644 --- a/source/blender/depsgraph/DEG_depsgraph.h +++ b/source/blender/depsgraph/DEG_depsgraph.h @@ -60,7 +60,6 @@ typedef struct Depsgraph Depsgraph; /* ------------------------------------------------ */ -struct EvaluationContext; struct Main; struct PointerRNA; @@ -75,19 +74,6 @@ typedef enum eEvaluationMode { DAG_EVAL_RENDER = 2, /* evaluate for render purposes */ } eEvaluationMode; -/* Dependency graph evaluation context - * - * This structure stores all the local dependency graph data, - * which is needed for it's evaluation, - */ -typedef struct EvaluationContext { - eEvaluationMode mode; - float ctime; - - struct Depsgraph *depsgraph; - struct ViewLayer *view_layer; -} EvaluationContext; - /* DagNode->eval_flags */ enum { /* Regardless to curve->path animation flag path is to be evaluated anyway, @@ -203,37 +189,6 @@ void DEG_ids_check_recalc(struct Main *bmain, /* ************************************************ */ /* Evaluation Engine API */ -/* Evaluation Context ---------------------------- */ - -/* Create new evaluation context. */ -struct EvaluationContext *DEG_evaluation_context_new(eEvaluationMode mode); - -/* Initialize evaluation context. - * Used by the areas which currently overrides the context or doesn't have - * access to a proper one. - */ -void DEG_evaluation_context_init(struct EvaluationContext *eval_ctx, - eEvaluationMode mode); -void DEG_evaluation_context_init_from_scene( - struct EvaluationContext *eval_ctx, - struct Scene *scene, - struct ViewLayer *view_layer, - eEvaluationMode mode); - -void DEG_evaluation_context_init_from_view_layer_for_render( - struct EvaluationContext *eval_ctx, - struct Depsgraph *depsgraph, - struct Scene *scene, - struct ViewLayer *view_layer); - -void DEG_evaluation_context_init_from_depsgraph( - struct EvaluationContext *eval_ctx, - struct Depsgraph *depsgraph, - eEvaluationMode mode); - -/* Free evaluation context. */ -void DEG_evaluation_context_free(struct EvaluationContext *eval_ctx); - /* Graph Evaluation ----------------------------- */ /* Frame changed recalculation entry point |