[Bf-blender-cvs] [11ee5aa4f9b] blender2.8: Avoid any possibility of using scene from different main in CTX_data_scene_layer

[Sergey Sharybin]

Commit: 11ee5aa4f9b60ddb7597b65926c125d5536863ca
Author: Sergey Sharybin
Date:   Tue Jul 11 16:40:18 2017 +0200
Branches: blender2.8
https://developer.blender.org/rB11ee5aa4f9b60ddb7597b65926c125d5536863ca

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.

===================================================================

M	source/blender/blenkernel/intern/context.c

===================================================================

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));
 	}
 }