diff --git a/source/blender/python/api2_2x/Blender.c b/source/blender/python/api2_2x/Blender.c
index 8b013068e13..41c41e787bb 100644
--- a/source/blender/python/api2_2x/Blender.c
+++ b/source/blender/python/api2_2x/Blender.c
@@ -245,7 +245,9 @@ static PyObject *Blender_Set( PyObject * self, PyObject * args )
 		if( !PyArg_Parse( arg, "i", &framenum ) )
 			return ( NULL ); /* TODO: Do we need to generate a nice error message here? */
 		G.scene->r.cfra = (short)framenum;
-		update_for_newframe(  );
+		/*	update all objects, so python scripts can export all objects in a scene
+			without worrying about the view layers */
+		scene_update_for_newframe(G.scene, (1<<20) - 1);
 		
 	} else if (StringEqual( name , "uscriptsdir" ) ) {
 		if ( !PyArg_Parse( arg , "s" , &dir ))
diff --git a/source/blender/python/api2_2x/Scene.c b/source/blender/python/api2_2x/Scene.c
index 8296fb5d0d4..effad817b34 100644
--- a/source/blender/python/api2_2x/Scene.c
+++ b/source/blender/python/api2_2x/Scene.c
@@ -76,11 +76,6 @@ struct View3D;
 
 PyObject *M_Object_Get( PyObject * self, PyObject * args ); /* from Object.c */
 
-/*----------------------------------- Python BPy_Scene defaults------------*/
-#define EXPP_SCENE_FRAME_MAX 30000
-#define EXPP_SCENE_RENDER_WINRESOLUTION_MIN 4
-#define EXPP_SCENE_RENDER_WINRESOLUTION_MAX 10000
-
 /* checks for the scene being removed */
 #define SCENE_DEL_CHECK_PY(bpy_scene) if (!(bpy_scene->scene)) return ( EXPP_ReturnPyObjError( PyExc_RuntimeError, "Scene has been removed" ) )
 #define SCENE_DEL_CHECK_INT(bpy_scene) if (!(bpy_scene->scene)) return ( EXPP_ReturnIntError( PyExc_RuntimeError, "Scene has been removed" ) )