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.

3 files changed, 3 insertions, 3 deletions

diff --git a/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp b/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
index 9627ad92c4c..f3b5b1fdda2 100644
--- a/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
+++ b/source/gameengine/GameLogic/SCA_2DFilterActuator.cpp
@@ -31,7 +31,7 @@ SCA_2DFilterActuator::SCA_2DFilterActuator(
 {
 }
 
-void SCA_2DFilterActuator::SetShaderText(STR_String& text)
+void SCA_2DFilterActuator::SetShaderText(STR_String text)
 {
 	m_shaderText = text;
 }
diff --git a/source/gameengine/GameLogic/SCA_2DFilterActuator.h b/source/gameengine/GameLogic/SCA_2DFilterActuator.h
index 76df95ac399..7b0cfff951e 100644
--- a/source/gameengine/GameLogic/SCA_2DFilterActuator.h
+++ b/source/gameengine/GameLogic/SCA_2DFilterActuator.h
@@ -33,7 +33,7 @@ public:
         PyTypeObject* T=&Type
         );
 
-	void	SetShaderText(STR_String& text);
+	void	SetShaderText(STR_String text);
     virtual ~SCA_2DFilterActuator();
     virtual bool Update();
 
diff --git a/source/gameengine/Ketsji/KX_RaySensor.cpp b/source/gameengine/Ketsji/KX_RaySensor.cpp
index ef3ec3e0be3..5c56f8f62b1 100644
--- a/source/gameengine/Ketsji/KX_RaySensor.cpp
+++ b/source/gameengine/Ketsji/KX_RaySensor.cpp
@@ -143,7 +143,7 @@ bool KX_RaySensor::RayHit(KX_ClientObjectInfo* client, MT_Point3& hit_point, MT_
 			
 	}
 
-	return true;
+	return bFound;
 	
 }