Merge remote-tracking branch 'upstream/lcs' into lcs

src/modelinfo/ModelIndices.h

@@ -35,7 +35,7 @@
 	X("veg_treea1",		MI_TREE3) \
 	X("veg_treeb1",		MI_TREE6) \
 	X("veg_treea3",		MI_TREE8) \
-	X("doc_crane_cab",	MODELID_CRANE_1) \
+	X("doc_crane_cab0",	MODELID_CRANE_1) \
 	X("doc_crane_cab01",	MODELID_CRANE_2) \
 	X("doc_crane_cab02",	MODELID_CRANE_3) \
 	X("doc_crane_cab03",	MODELID_CRANE_4) \

src/skel/glfw/glfw.cpp

@@ -216,6 +216,10 @@ psGrabScreen(RwCamera *pCamera)
 		RwImageSetFromRaster(pImage, pRaster);
 		return pImage;
 	}
+#else
+	rw::Image *image = RwCameraGetRaster(pCamera)->toImage();
+	if(image)
+		return image;
 #endif
 	return nil;
 }

src/skel/win/win.cpp

@@ -257,6 +257,10 @@ psGrabScreen(RwCamera *pCamera)
 		RwImageSetFromRaster(pImage, pRaster);
 		return pImage;
 	}
+#else
+	rw::Image *image = RwCameraGetRaster(pCamera)->toImage();
+	if(image)
+		return image;
 #endif
 	return nil;
 }

vendor/librw

@@ -1 +1 @@
-Subproject commit 78d540fce0ca090b07377cee40d73eadfb7a699d
+Subproject commit 9260bddc66f70eb51adf0749fa835fed1562c178