diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2017-08-16 05:45:11 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2017-08-16 05:46:04 +0300 |
| commit | 1b462e5a51458e36df886838ee272b4bb18ed4da (patch) | |
| tree | dd74f29b57df23219ad68d2579a6271c21e1eddb /source/blender/collada/collada_utils.h | |
| parent | b68b26c265d0984da08773196c0d673881fd6c13 (diff) | |
Pass EvaluationContext instead of bContext
2.8x branch added bContext arg in many places,
pass eval-context instead since its not simple to reason about what
what nested functions do when they can access and change almost anything.
Also use const to prevent unexpected modifications.
This fixes crash loading files with shadows,
since off-screen buffers use a NULL context for rendering.
Diffstat (limited to 'source/blender/collada/collada_utils.h')
| -rw-r--r-- | source/blender/collada/collada_utils.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/collada/collada_utils.h b/source/blender/collada/collada_utils.h index df972c5b89c..75e9fb5dcea 100644 --- a/source/blender/collada/collada_utils.h +++ b/source/blender/collada/collada_utils.h @@ -68,7 +68,7 @@ extern float bc_get_float_value(const COLLADAFW::FloatOrDoubleArray& array, unsi extern int bc_test_parent_loop(Object *par, Object *ob); extern int bc_set_parent(Object *ob, Object *par, bContext *C, bool is_parent_space = true); extern Object *bc_add_object(Scene *scene, int type, const char *name); -extern Mesh *bc_get_mesh_copy(struct EvaluationContext *eval_ctx, Scene *scene, Object *ob, BC_export_mesh_type export_mesh_type, bool apply_modifiers, bool triangulate); +extern Mesh *bc_get_mesh_copy(const struct EvaluationContext *eval_ctx, Scene *scene, Object *ob, BC_export_mesh_type export_mesh_type, bool apply_modifiers, bool triangulate); extern Object *bc_get_assigned_armature(Object *ob); extern Object *bc_get_highest_selected_ancestor_or_self(LinkNode *export_set, Object *ob); |