]>
Commit | Line | Data |
---|---|---|
e9a11cba JR |
1 | --- cegui-0.8.7/cmake/FindOgre.cmake~ 2019-10-20 11:06:37.000000000 +0200 |
2 | +++ cegui-0.8.7/cmake/FindOgre.cmake 2019-10-20 11:15:03.776472437 +0200 | |
3 | @@ -249,7 +249,7 @@ | |
4 | endif () | |
5 | endif() | |
6 | ||
7 | - file (STRINGS "${OGRE_H_PATH}/OgrePrerequisites.h" _CEGUIOGREVERSIONDEFINES REGEX ".*#define OGRE_VERSION_.*[0-9]+") | |
8 | + file (STRINGS "${OGRE_H_PATH}/OgreBuildSettings.h" _CEGUIOGREVERSIONDEFINES REGEX ".*#define OGRE_VERSION_.*[0-9]+") | |
9 | ||
10 | foreach (ver MAJOR MINOR PATCH) | |
11 | set (CEGUI_FOUND_OGRE_VERSION_${ver} 0) | |
12 | --- cegui-0.8.7/cegui/src/RendererModules/Ogre/Texture.cpp.orig 2016-04-23 20:19:40.000000000 +0200 | |
13 | +++ cegui-0.8.7/cegui/src/RendererModules/Ogre/Texture.cpp 2019-10-20 11:23:14.259789302 +0200 | |
14 | @@ -243,7 +243,7 @@ | |
15 | // address the issue as close to the source of the problem as possible. | |
16 | Ogre::PixelBox pb(area.getWidth(), area.getHeight(), | |
17 | 1, Ogre::PF_A8R8G8B8, const_cast<void*>(sourceData)); | |
18 | - Ogre::Image::Box box(area.left(), area.top(), area.right(), area.bottom()); | |
19 | + Ogre::Box box(area.left(), area.top(), area.right(), area.bottom()); | |
20 | d_texture->getBuffer()->blitFromMemory(pb, box); | |
21 | } | |
22 |