diff options
author | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-11-27 14:14:03 +0300 |
---|---|---|
committer | Gaia Clary <gaia.clary@machinimatrix.org> | 2018-11-27 14:22:30 +0300 |
commit | 4c1a01d1a07138aa9b80ab34cc3bde1df5ec141e (patch) | |
tree | 32ac0b865c81c7dbb14b95e8a1cbc03c24822b59 /source/blender/collada | |
parent | dcb86689b037e545b08ff35c355db08889b73ef1 (diff) |
fix: Collada Exporter: improve usage of viewlayer and depsgraph
* The exporter now gets the view layer from the context
instead of the depsgraph.
* The depsgrap is now fetched only on demand since the graph
is not always needed for exporting (currently only for armature exports).
Diffstat (limited to 'source/blender/collada')
-rw-r--r-- | source/blender/collada/BlenderContext.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/collada/BlenderContext.cpp b/source/blender/collada/BlenderContext.cpp index 536d517bd6e..fcfd9241649 100644 --- a/source/blender/collada/BlenderContext.cpp +++ b/source/blender/collada/BlenderContext.cpp @@ -25,14 +25,15 @@ */ #include "BlenderContext.h" +#include "BKE_scene.h" BlenderContext::BlenderContext(bContext *C) { context = C; main = CTX_data_main(C); - depsgraph = CTX_data_depsgraph(C); scene = CTX_data_scene(C); - view_layer = DEG_get_evaluated_view_layer(depsgraph); + view_layer = CTX_data_view_layer(C); + depsgraph = nullptr; // create only when needed } bContext *BlenderContext::get_context() @@ -42,6 +43,9 @@ bContext *BlenderContext::get_context() Depsgraph *BlenderContext::get_depsgraph() { + if (!depsgraph) { + depsgraph = BKE_scene_get_depsgraph(scene, view_layer, true); + } return depsgraph; } |