diff options
author | Benoit Bolsee <benoit.bolsee@online.be> | 2009-05-11 01:30:30 +0400 |
---|---|---|
committer | Benoit Bolsee <benoit.bolsee@online.be> | 2009-05-11 01:30:30 +0400 |
commit | 89c2d80d32228a140f27b2b2c0e25b30fc1394a8 (patch) | |
tree | 2594e909de3981052f013c04bfe7d97185a98a6b /source | |
parent | a6721e549d560c12c07a6a0f14ada3c429d4bc79 (diff) |
Linux compilation problem, better fix
Diffstat (limited to 'source')
-rw-r--r-- | source/gameengine/Converter/KX_ConvertActuators.cpp | 3 | ||||
-rw-r--r-- | source/gameengine/GameLogic/SCA_2DFilterActuator.cpp | 2 | ||||
-rw-r--r-- | source/gameengine/GameLogic/SCA_2DFilterActuator.h | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/source/gameengine/Converter/KX_ConvertActuators.cpp b/source/gameengine/Converter/KX_ConvertActuators.cpp index 5d3db25b9ed..60d64621665 100644 --- a/source/gameengine/Converter/KX_ConvertActuators.cpp +++ b/source/gameengine/Converter/KX_ConvertActuators.cpp @@ -1105,8 +1105,7 @@ void BL_ConvertActuators(char* maggiename, buf = txt_to_buf(_2dfilter->text); if (buf) { - STR_String buf_str= buf; - tmp->SetShaderText(buf_str); + tmp->SetShaderText(buf); MEM_freeN(buf); } } diff --git a/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp b/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp index 1aaa59ee207..7682f6755ef 100644 --- a/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp +++ b/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp @@ -95,7 +95,7 @@ bool SCA_2DFilterActuator::Update() } -void SCA_2DFilterActuator::SetShaderText(STR_String& text) +void SCA_2DFilterActuator::SetShaderText(const char *text) { m_shaderText = text; } diff --git a/source/gameengine/GameLogic/SCA_2DFilterActuator.h b/source/gameengine/GameLogic/SCA_2DFilterActuator.h index aea3a35d404..13b9997a010 100644 --- a/source/gameengine/GameLogic/SCA_2DFilterActuator.h +++ b/source/gameengine/GameLogic/SCA_2DFilterActuator.h @@ -60,7 +60,7 @@ public: PyTypeObject* T=&Type ); - void SetShaderText(STR_String& text); + void SetShaderText(const char *text); virtual ~SCA_2DFilterActuator(); virtual bool Update(); |