[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20132] trunk/blender/source/gameengine: changes to get benoits logic updates building on scons with gcc

[Campbell Barton]

Revision: 20132
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20132
Author:   campbellbarton
Date:     2009-05-10 23:22:25 +0200 (Sun, 10 May 2009)

Log Message:
-----------
changes to get benoits logic updates building on scons with gcc

Modified Paths:
--------------
    trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
    trunk/blender/source/gameengine/Expressions/SConscript
    trunk/blender/source/gameengine/GameLogic/SConscript
    trunk/blender/source/gameengine/Ketsji/KXNetwork/SConscript

Modified: trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp	2009-05-10 21:02:58 UTC (rev 20131)
+++ trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp	2009-05-10 21:22:25 UTC (rev 20132)
@@ -1105,7 +1105,8 @@
 				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);
 				}
 			}

Modified: trunk/blender/source/gameengine/Expressions/SConscript
===================================================================
--- trunk/blender/source/gameengine/Expressions/SConscript	2009-05-10 21:02:58 UTC (rev 20131)
+++ trunk/blender/source/gameengine/Expressions/SConscript	2009-05-10 21:22:25 UTC (rev 20132)
@@ -3,7 +3,7 @@
 
 sources = env.Glob('*.cpp')
 
-incs ='. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/Scenegraph'
+incs ='. #source/kernel/gen_system #intern/string #intern/moto/include #source/gameengine/SceneGraph'
 incs += ' ' + env['BF_PYTHON_INC']
 
 cxxflags = []

Modified: trunk/blender/source/gameengine/GameLogic/SConscript
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SConscript	2009-05-10 21:02:58 UTC (rev 20131)
+++ trunk/blender/source/gameengine/GameLogic/SConscript	2009-05-10 21:22:25 UTC (rev 20132)
@@ -5,7 +5,7 @@
 
 incs = '. #/source/kernel/gen_system #/intern/string'
 incs += ' #/source/gameengine/Expressions #/intern/moto/include'
-incs += ' #/source/gameengine/Rasterizer #/source/gameengine/Scenegraph'
+incs += ' #/source/gameengine/Rasterizer #/source/gameengine/SceneGraph'
 
 incs += ' ' + env['BF_PYTHON_INC']
 

Modified: trunk/blender/source/gameengine/Ketsji/KXNetwork/SConscript
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KXNetwork/SConscript	2009-05-10 21:02:58 UTC (rev 20131)
+++ trunk/blender/source/gameengine/Ketsji/KXNetwork/SConscript	2009-05-10 21:22:25 UTC (rev 20132)
@@ -5,7 +5,7 @@
 
 incs = '. #source/kernel/gen_system #intern/string #source/gameengine/Ketsji'
 incs += ' #source/gameengine/GameLogic #source/gameengine/Expressions'
-incs += ' #source/gameengine/Network #source/gameengine/Scenegraph'
+incs += ' #source/gameengine/Network #source/gameengine/SceneGraph'
 
 incs += ' ' + env['BF_PYTHON_INC']