[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25111] trunk/blender/source/blender: Cleaning: update a couple of functions to use scene from context instead of from screen .

[Martin Poirier]

Revision: 25111
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25111
Author:   theeth
Date:     2009-12-04 02:25:43 +0100 (Fri, 04 Dec 2009)

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

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/BKE_screen.h
    trunk/blender/source/blender/blenkernel/intern/depsgraph.c
    trunk/blender/source/blender/blenkernel/intern/screen.c
    trunk/blender/source/blender/editors/screen/screen_edit.c

Modified: trunk/blender/source/blender/blenkernel/BKE_screen.h
===================================================================
--- trunk/blender/source/blender/blenkernel/BKE_screen.h	2009-12-04 01:21:55 UTC (rev 25110)
+++ trunk/blender/source/blender/blenkernel/BKE_screen.h	2009-12-04 01:25:43 UTC (rev 25111)
@@ -41,6 +41,7 @@
 struct Menu;
 struct ScrArea;
 struct SpaceType;
+struct Scene;
 struct wmNotifier;
 struct wmWindow;
 struct wmWindowManager;
@@ -233,7 +234,7 @@
 
 /* screen */
 void free_screen(struct bScreen *sc); 
-unsigned int BKE_screen_visible_layers(struct bScreen *screen);
+unsigned int BKE_screen_visible_layers(struct bScreen *screen, struct Scene *scene);
 
 #endif
 

Modified: trunk/blender/source/blender/blenkernel/intern/depsgraph.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/depsgraph.c	2009-12-04 01:21:55 UTC (rev 25110)
+++ trunk/blender/source/blender/blenkernel/intern/depsgraph.c	2009-12-04 01:25:43 UTC (rev 25111)
@@ -2155,7 +2155,7 @@
 		for(win=wm->windows.first; win; win=win->next) {
 			if(win->screen) {
 				if(!*sce) *sce= win->screen->scene;
-				*lay |= BKE_screen_visible_layers(win->screen);
+				*lay |= BKE_screen_visible_layers(win->screen, win->screen->scene);
 			}
 		}
 	}

Modified: trunk/blender/source/blender/blenkernel/intern/screen.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/screen.c	2009-12-04 01:21:55 UTC (rev 25110)
+++ trunk/blender/source/blender/blenkernel/intern/screen.c	2009-12-04 01:25:43 UTC (rev 25111)
@@ -318,21 +318,20 @@
 }
 
 /* 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;
+	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;
+	}
 
-	/* 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;
 }

Modified: trunk/blender/source/blender/editors/screen/screen_edit.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_edit.c	2009-12-04 01:21:55 UTC (rev 25110)
+++ trunk/blender/source/blender/editors/screen/screen_edit.c	2009-12-04 01:25:43 UTC (rev 25111)
@@ -1614,13 +1614,13 @@
 void ED_update_for_newframe(const bContext *C, int mute)
 {
 	bScreen *screen= CTX_wm_screen(C);
-	Scene *scene= screen->scene;
+	Scene *scene= CTX_data_scene(C);
 	
 	//extern void audiostream_scrub(unsigned int frame);	/* seqaudio.c */
 	
 	/* this function applies the changes too */
 	/* XXX future: do all windows */
-	scene_update_for_newframe(scene, BKE_screen_visible_layers(screen)); /* BKE_scene.h */
+	scene_update_for_newframe(scene, BKE_screen_visible_layers(screen, scene)); /* BKE_scene.h */
 	
 	//if ( (CFRA>1) && (!mute) && (scene->r.audio.flag & AUDIO_SCRUB)) 
 	//	audiostream_scrub( CFRA );