Cleaning: update a couple of functions to use scene from context instead of from screen.

1 files changed, 8 insertions, 9 deletions

diff --git a/source/blender/blenkernel/intern/screen.c b/source/blender/blenkernel/intern/screen.c
index 459db96dbfb..0dc6bf359f6 100644
--- a/source/blender/blenkernel/intern/screen.c
+++ b/source/blender/blenkernel/intern/screen.c
@@ -318,21 +318,20 @@ void free_screen(bScreen *sc)
 }
 
 /* for depsgraph */
-unsigned int BKE_screen_visible_layers(bScreen *screen)
+unsigned int BKE_screen_visible_layers(bScreen *screen, Scene *scene)
 {
 	ScrArea *sa;
 	unsigned int layer= 0;
 
-	if(!screen)
-		return layer;
-
-	/* get all used view3d layers */
-	for(sa= screen->areabase.first; sa; sa= sa->next)
-		if(sa->spacetype==SPACE_VIEW3D)
-			layer |= ((View3D *)sa->spacedata.first)->lay;
+	if(screen) {
+		/* get all used view3d layers */
+		for(sa= screen->areabase.first; sa; sa= sa->next)
+			if(sa->spacetype==SPACE_VIEW3D)
+				layer |= ((View3D *)sa->spacedata.first)->lay;
+	}
 
 	if(!layer)
-		return screen->scene->lay;
+		return scene->lay;
 
 	return layer;
 }