diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2011-12-31 16:03:36 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2011-12-31 16:03:36 +0400 |
| commit | 78a4e2461419f026d53e409cb75073ba5f47e1bb (patch) | |
| tree | 2847f536bee9b51a0d30f59baf6becc22a8acffd /source/gameengine | |
| parent | 81f5c9ed9b8193864f1c6160aed9eef9338f0d27 (diff) | |
| parent | bac6757ea0b1c873b8dd8221592ea95eed8d5bac (diff) | |
svn merge ^/trunk/blender -r43009:43033
Diffstat (limited to 'source/gameengine')
| -rw-r--r-- | source/gameengine/Ketsji/KX_FontObject.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source/gameengine/Ketsji/KX_FontObject.cpp b/source/gameengine/Ketsji/KX_FontObject.cpp index eca9a14ce7c..5a4d9065605 100644 --- a/source/gameengine/Ketsji/KX_FontObject.cpp +++ b/source/gameengine/Ketsji/KX_FontObject.cpp @@ -118,8 +118,8 @@ void KX_FontObject::ProcessReplica() void KX_FontObject::DrawText() { /* Allow for some logic brick control */ - if(this->GetProperty("text")) - m_text = split_string(this->GetProperty("text")->GetText()); + if(this->GetProperty("Text")) + m_text = split_string(this->GetProperty("Text")->GetText()); /* only draws the text if visible */ if(this->GetVisible() == 0) return; |