forked from bartvdbraak/blender
Linux compilation problem, better fix
This commit is contained in:
parent
a6721e549d
commit
89c2d80d32
@ -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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -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;
|
||||||
}
|
}
|
||||||
|
@ -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();
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user