Merge remote-tracking branch 'origin/miami' into lcs

# Conflicts:
#	src/modelinfo/PedModelInfo.cpp

src/rw/RwHelper.cpp

@@ -4,6 +4,7 @@
 #include "Timecycle.h"
 #include "skeleton.h"
 #include "Debug.h"
+#include "MBlur.h"
 #if !defined(FINAL) || defined(DEBUGMENU)
 #include "rtcharse.h"
 #endif
@@ -579,6 +580,12 @@ CameraSize(RwCamera * camera, RwRect * rect,
 			
 			raster->width = zRaster->width = rect->w;
 			raster->height = zRaster->height = rect->h;
+#endif
+#ifdef FIX_BUGS
+			if(CMBlur::BlurOn){
+				CMBlur::MotionBlurClose();
+				CMBlur::MotionBlurOpen(camera);
+			}
 #endif
 		}