Merge branch releases/1.8 revisions 5529-5631 into trunk:
- Add comment to Makefile about MinGW compilation - Fix serialization of OverrideTextColorEnabled flag in CGUITab git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5632 dfc29bdd-3216-0410-991c-e03cc46cb475master
parent
438fb2a0ac
commit
09767f2541
|
@ -205,6 +205,7 @@ should now be fps independentn
|
|||
|
||||
--------------------------
|
||||
Changes in 1.8.5
|
||||
- Fix serialization of OverrideTextColorEnabled flag in CGUITab. Thanks @ chronologicaldot for reporting (http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=52344&p=303891#p303891)
|
||||
- CFileSystem::getAbsolutePath no longer wrongly converts an empty filename to "/" on unix platforms.
|
||||
This fixes the bug that CFileSystem::createAndOpenFile("") returned a (strange behaving) non-null file pointer.
|
||||
Additional check also added in createAndOpenFile to early out on empty names.
|
||||
|
|
|
@ -141,12 +141,9 @@ void CGUITab::deserializeAttributes(io::IAttributes* in, io::SAttributeReadWrite
|
|||
setNumber(in->getAttributeAsInt("TabNumber"));
|
||||
setDrawBackground(in->getAttributeAsBool("DrawBackground"));
|
||||
setBackgroundColor(in->getAttributeAsColor("BackColor"));
|
||||
bool override = in->getAttributeAsBool("OverrideTextColorEnabled");
|
||||
if ( in->existsAttribute("OverrideTextColorEnabled") )
|
||||
OverrideTextColorEnabled = in->getAttributeAsBool("OverrideTextColorEnabled");
|
||||
setTextColor(in->getAttributeAsColor("TextColor"));
|
||||
if ( !override )
|
||||
{
|
||||
OverrideTextColorEnabled = false;
|
||||
}
|
||||
|
||||
if (Parent && Parent->getType() == EGUIET_TAB_CONTROL)
|
||||
{
|
||||
|
|
|
@ -27,6 +27,8 @@ VERSION_RELEASE = 0
|
|||
#
|
||||
# make win32
|
||||
#
|
||||
# Or as MinGW by default has CC set to cc - but has no compiler by that name - you might have to do:
|
||||
# make CC=gcc win32
|
||||
|
||||
#List of object files, separated based on engine architecture
|
||||
IRRMESHLOADER = CBSPMeshFileLoader.o CMD2MeshFileLoader.o CMD3MeshFileLoader.o CMS3DMeshFileLoader.o CB3DMeshFileLoader.o C3DSMeshFileLoader.o COgreMeshFileLoader.o COBJMeshFileLoader.o CColladaFileLoader.o CCSMLoader.o CDMFLoader.o CLMTSMeshFileLoader.o CMY3DMeshFileLoader.o COCTLoader.o CXMeshFileLoader.o CIrrMeshFileLoader.o CSTLMeshFileLoader.o CLWOMeshFileLoader.o CPLYMeshFileLoader.o CSMFMeshFileLoader.o CMeshTextureLoader.o
|
||||
|
|
Loading…
Reference in New Issue