[Bf-blender-cvs] [6ab3a2f] master: Change naming slightly, it conflicts with DrawText function define on windows on MinGW
Antony Riakiotakis
noreply at git.blender.org
Wed Apr 30 13:57:19 CEST 2014
Commit: 6ab3a2f8a454aa47e4d64b6d1320dfc0c16546df
Author: Antony Riakiotakis
Date: Wed Apr 30 11:53:41 2014 +0300
https://developer.blender.org/rB6ab3a2f8a454aa47e4d64b6d1320dfc0c16546df
Change naming slightly, it conflicts with DrawText function define on
windows on MinGW
===================================================================
M source/gameengine/Ketsji/KX_FontObject.cpp
M source/gameengine/Ketsji/KX_FontObject.h
M source/gameengine/Ketsji/KX_Scene.cpp
===================================================================
diff --git a/source/gameengine/Ketsji/KX_FontObject.cpp b/source/gameengine/Ketsji/KX_FontObject.cpp
index a0266a5..9789a82 100644
--- a/source/gameengine/Ketsji/KX_FontObject.cpp
+++ b/source/gameengine/Ketsji/KX_FontObject.cpp
@@ -166,7 +166,7 @@ int GetFontId(VFont *vfont)
return fontid;
}
-void KX_FontObject::DrawText()
+void KX_FontObject::DrawFontText()
{
/* Allow for some logic brick control */
if (this->GetProperty("Text"))
diff --git a/source/gameengine/Ketsji/KX_FontObject.h b/source/gameengine/Ketsji/KX_FontObject.h
index 8b66acc..209ab6c 100644
--- a/source/gameengine/Ketsji/KX_FontObject.h
+++ b/source/gameengine/Ketsji/KX_FontObject.h
@@ -45,7 +45,7 @@ public:
virtual ~KX_FontObject();
- void DrawText();
+ void DrawFontText();
/**
* Inherited from CValue -- return a new copy of this
diff --git a/source/gameengine/Ketsji/KX_Scene.cpp b/source/gameengine/Ketsji/KX_Scene.cpp
index 4ed5d83..65f5ff1 100644
--- a/source/gameengine/Ketsji/KX_Scene.cpp
+++ b/source/gameengine/Ketsji/KX_Scene.cpp
@@ -1742,7 +1742,7 @@ void KX_Scene::RenderFonts()
{
list<KX_FontObject*>::iterator it = m_fonts.begin();
while (it != m_fonts.end()) {
- (*it)->DrawText();
+ (*it)->DrawFontText();
++it;
}
}
More information about the Bf-blender-cvs
mailing list