svn merge -r36583:36603 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-05-11 00:19:13 +00:00
parent bcdd9d236c fab1ee1f78
commit 0f329ebdf1
38 changed files with 209 additions and 99 deletions
--- a/source/blender/editors/screen/screen_ops.c
+++ b/source/blender/editors/screen/screen_ops.c
@@ -111,7 +111,7 @@ int ED_operator_screenactive(bContext *C)
 }

 /* XXX added this to prevent anim state to change during renders */
-int ED_operator_screenactive_norender(bContext *C)
+static int ED_operator_screenactive_norender(bContext *C)
 {
 	if(G.rendering) return 0;
 	if(CTX_wm_window(C)==NULL) return 0;