[Bf-blender-cvs] [fb5682412d] render-layers: Let scene_collection and layer_collection to have the same fallback

[Dalai Felinto]

Commit: fb5682412d70b3da2cc444dd1c16e46bc536a36c
Author: Dalai Felinto
Date:   Tue Jan 31 11:45:09 2017 +0100
Branches: render-layers
https://developer.blender.org/rBfb5682412d70b3da2cc444dd1c16e46bc536a36c

Let scene_collection and layer_collection to have the same fallback

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

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

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

diff --git a/source/blender/blenkernel/intern/context.c b/source/blender/blenkernel/intern/context.c
index dc56794f2a..afc4a397d0 100644
--- a/source/blender/blenkernel/intern/context.c
+++ b/source/blender/blenkernel/intern/context.c
@@ -952,12 +952,9 @@ SceneCollection *CTX_data_scene_collection(const bContext *C)
 		}
 	}
 
-	LayerCollection *lc;
-	if (ctx_data_pointer_verify(C, "layer_collection", (void *)&lc)) {
-		lc = CTX_data_layer_collection(C);
-		if (lc) {
-			return lc->scene_collection;
-		}
+	LayerCollection *lc = CTX_data_layer_collection(C);
+	if (lc) {
+		return lc->scene_collection;
 	}
 
 	/* fallback */