Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2017-07-11 17:40:18 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2017-07-11 17:40:18 +0300
commit11ee5aa4f9b60ddb7597b65926c125d5536863ca (patch)
treec2032a789198bec3cbfaf3fc20e6e7d643661ba3 /source/blender/blenkernel/intern/context.c
parentded2b30ebc81b604c76d65cd029da0876b819122 (diff)
Avoid any possibility of using scene from different main in CTX_data_scene_layer
While these functions might be considered a temporary solution, please still be very accurate about data ownership and where data is coming from.
Diffstat (limited to 'source/blender/blenkernel/intern/context.c')
-rw-r--r--source/blender/blenkernel/intern/context.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index ac214a70b75..0ad853b016a 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -915,7 +915,7 @@ SceneLayer *CTX_data_scene_layer(const bContext *C)
return sl;
}
else {
- return BKE_scene_layer_context_active(CTX_data_scene(C));
+ return BKE_scene_layer_context_active_ex(CTX_data_main(C), CTX_data_scene(C));
}
}