[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20133] trunk/blender/source/gameengine: Linux compilation problem, better fix

Benoit Bolsee benoit.bolsee at online.be
Sun May 10 23:30:30 CEST 2009


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

Log Message:
-----------
Linux compilation problem, better fix

Modified Paths:
--------------
    trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.h

Modified: trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
===================================================================
--- trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp	2009-05-10 21:22:25 UTC (rev 20132)
+++ trunk/blender/source/gameengine/Converter/KX_ConvertActuators.cpp	2009-05-10 21:30:30 UTC (rev 20133)
@@ -1105,8 +1105,7 @@
 				buf = txt_to_buf(_2dfilter->text);
 				if (buf)
 				{
-					STR_String buf_str= buf;
-					tmp->SetShaderText(buf_str);
+					tmp->SetShaderText(buf);
 					MEM_freeN(buf);
 				}
 			}

Modified: trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp	2009-05-10 21:22:25 UTC (rev 20132)
+++ trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp	2009-05-10 21:30:30 UTC (rev 20133)
@@ -95,7 +95,7 @@
 }
 
 
-void SCA_2DFilterActuator::SetShaderText(STR_String& text)
+void SCA_2DFilterActuator::SetShaderText(const char *text)
 {
 	m_shaderText = text;
 }

Modified: trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.h
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.h	2009-05-10 21:22:25 UTC (rev 20132)
+++ trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.h	2009-05-10 21:30:30 UTC (rev 20133)
@@ -60,7 +60,7 @@
         PyTypeObject* T=&Type
         );
 
-	void	SetShaderText(STR_String& text);
+	void	SetShaderText(const char *text);
     virtual ~SCA_2DFilterActuator();
     virtual bool Update();
 





More information about the Bf-blender-cvs mailing list