sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Linux compilation problem, better fix

Browse Source
This commit is contained in:
Benoit Bolsee 2009-05-10 21:30:30 +00:00
parent a6721e549d
commit 89c2d80d32
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/gameengine/Converter/KX_ConvertActuators.cpp
View File

@ -1105,8 +1105,7 @@ void BL_ConvertActuators(char* maggiename,
buf = txt_to_buf(_2dfilter->text); buf = txt_to_buf(_2dfilter->text);
if (buf) if (buf)
{ {
STR_String buf_str= buf; tmp->SetShaderText(buf);
tmp->SetShaderText(buf_str);
MEM_freeN(buf); MEM_freeN(buf);
} }
} }

2
source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
View File

@ -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; m_shaderText = text;
} }

2
source/gameengine/GameLogic/SCA_2DFilterActuator.h
View File

@ -60,7 +60,7 @@ public:
PyTypeObject* T=&Type PyTypeObject* T=&Type
); );
void SetShaderText(STR_String& text); void SetShaderText(const char *text);
virtual ~SCA_2DFilterActuator(); virtual ~SCA_2DFilterActuator();
virtual bool Update(); virtual bool Update();