[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [13557] trunk/blender/source/gameengine: bugfix 8183, Ray sensor with material/ property filter always triggers when hitting object without the required characteristic fixed by Benoit Blosee (ben2610), and some minor changes for 2d-filters.

[Hamed Zaghaghi]

Revision: 13557
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=13557
Author:   zaghaghi
Date:     2008-02-04 04:48:46 +0100 (Mon, 04 Feb 2008)

Log Message:
-----------
bugfix 8183, Ray sensor with material/property filter always triggers when hitting object without the required characteristic fixed by Benoit Blosee(ben2610), and some minor changes for 2d-filters.

Modified Paths:
--------------
    trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
    trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.h
    trunk/blender/source/gameengine/Ketsji/KX_RaySensor.cpp

Modified: trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp	2008-02-04 02:33:27 UTC (rev 13556)
+++ trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp	2008-02-04 03:48:46 UTC (rev 13557)
@@ -31,7 +31,7 @@
 {
 }
 
-void SCA_2DFilterActuator::SetShaderText(STR_String& text)
+void SCA_2DFilterActuator::SetShaderText(STR_String text)
 {
 	m_shaderText = text;
 }

Modified: trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.h
===================================================================
--- trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.h	2008-02-04 02:33:27 UTC (rev 13556)
+++ trunk/blender/source/gameengine/GameLogic/SCA_2DFilterActuator.h	2008-02-04 03:48:46 UTC (rev 13557)
@@ -33,7 +33,7 @@
         PyTypeObject* T=&Type
         );
 
-	void	SetShaderText(STR_String& text);
+	void	SetShaderText(STR_String text);
     virtual ~SCA_2DFilterActuator();
     virtual bool Update();
 

Modified: trunk/blender/source/gameengine/Ketsji/KX_RaySensor.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_RaySensor.cpp	2008-02-04 02:33:27 UTC (rev 13556)
+++ trunk/blender/source/gameengine/Ketsji/KX_RaySensor.cpp	2008-02-04 03:48:46 UTC (rev 13557)
@@ -143,7 +143,7 @@
 			
 	}
 
-	return true;
+	return bFound;
 	
 }