[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58552] trunk/blender/source/blender: avoid calling context functions when direct access is possible.

[Campbell Barton]

Revision: 58552
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58552
Author:   campbellbarton
Date:     2013-07-23 18:30:06 +0000 (Tue, 23 Jul 2013)
Log Message:
-----------
avoid calling context functions when direct access is possible.

Modified Paths:
--------------
    trunk/blender/source/blender/editors/screen/screen_ops.c
    trunk/blender/source/blender/windowmanager/intern/wm_event_system.c

Modified: trunk/blender/source/blender/editors/screen/screen_ops.c
===================================================================
--- trunk/blender/source/blender/editors/screen/screen_ops.c	2013-07-23 18:03:40 UTC (rev 58551)
+++ trunk/blender/source/blender/editors/screen/screen_ops.c	2013-07-23 18:30:06 UTC (rev 58552)
@@ -3184,7 +3184,7 @@
 			sound_seek_scene(bmain, scene);
 		
 		/* since we follow drawflags, we can't send notifier but tag regions ourselves */
-		ED_update_for_newframe(CTX_data_main(C), scene, 1);
+		ED_update_for_newframe(bmain, scene, 1);
 
 		for (window = wm->windows.first; window; window = window->next) {
 			for (sa = window->screen->areabase.first; sa; sa = sa->next) {

Modified: trunk/blender/source/blender/windowmanager/intern/wm_event_system.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2013-07-23 18:03:40 UTC (rev 58551)
+++ trunk/blender/source/blender/windowmanager/intern/wm_event_system.c	2013-07-23 18:30:06 UTC (rev 58552)
@@ -274,7 +274,7 @@
 			}
 
 			if (note->window == win ||
-			    (note->window == NULL && (note->reference == NULL || note->reference == CTX_data_scene(C))))
+			    (note->window == NULL && (note->reference == NULL || note->reference == win->screen->scene)))
 			{
 				if (note->category == NC_SCENE) {
 					if (note->data == ND_FRAME)
@@ -282,7 +282,7 @@
 				}
 			}
 			if (ELEM5(note->category, NC_SCENE, NC_OBJECT, NC_GEOM, NC_SCENE, NC_WM)) {
-				ED_info_stats_clear(CTX_data_scene(C));
+				ED_info_stats_clear(win->screen->scene);
 				WM_event_add_notifier(C, NC_SPACE | ND_SPACE_INFO, NULL);
 			}
 		}