Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2009-05-11 01:22:25 +0400
committerCampbell Barton <ideasman42@gmail.com>2009-05-11 01:22:25 +0400
commita6721e549d560c12c07a6a0f14ada3c429d4bc79 (patch)
tree80259e17b4dead0c42605ec2488a59b22c60b1e8 /source/gameengine/Converter
parent386122ada6432b29437c3ca7f1eea2b5b919d377 (diff)
changes to get benoits logic updates building on scons with gcc
Diffstat (limited to 'source/gameengine/Converter')
-rw-r--r--source/gameengine/Converter/KX_ConvertActuators.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/gameengine/Converter/KX_ConvertActuators.cpp b/source/gameengine/Converter/KX_ConvertActuators.cpp
index 76b8540118a..5d3db25b9ed 100644
--- a/source/gameengine/Converter/KX_ConvertActuators.cpp
+++ b/source/gameengine/Converter/KX_ConvertActuators.cpp
@@ -1105,7 +1105,8 @@ void BL_ConvertActuators(char* maggiename,
buf = txt_to_buf(_2dfilter->text);
if (buf)
{
- tmp->SetShaderText(STR_String(buf));
+ STR_String buf_str= buf;
+ tmp->SetShaderText(buf_str);
MEM_freeN(buf);
}
}