archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-02 15:30:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	vendor/librw
This commit is contained in:
Sergeanur
2021-01-21 16:03:27 +02:00
parent cc94419a72 f0097ff733
commit ed74182cc2
4 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/skel/glfw/glfw.cpp
View File

@ -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;
}

4
src/skel/win/win.cpp
View File

@ -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;
}