svn merge ^/trunk/blender -r41075:41099

3 files changed, 3 insertions, 3 deletions

diff --git a/source/gameengine/Converter/BL_ArmatureObject.cpp b/source/gameengine/Converter/BL_ArmatureObject.cpp
index c5bf28b9b8d..43c9bd434c5 100644
--- a/source/gameengine/Converter/BL_ArmatureObject.cpp
+++ b/source/gameengine/Converter/BL_ArmatureObject.cpp
@@ -663,7 +663,7 @@ KX_PYMETHODDEF_DOC_NOARGS(BL_ArmatureObject, update,
 						  "update()\n"
 						  "Make sure that the armature will be updated on next graphic frame.\n"
 						  "This is automatically done if a KX_ArmatureActuator with mode run is active\n"
-						  "or if an action is playing. This function is usefull in other cases.\n")
+						  "or if an action is playing. This function is useful in other cases.\n")
 {
 	SetActiveAction(NULL, 0, KX_GetActiveEngine()->GetFrameTime());
 	Py_RETURN_NONE;
diff --git a/source/gameengine/Expressions/ConstExpr.cpp b/source/gameengine/Expressions/ConstExpr.cpp
index 8d5a47b2d0d..c41cf5a54f5 100644
--- a/source/gameengine/Expressions/ConstExpr.cpp
+++ b/source/gameengine/Expressions/ConstExpr.cpp
@@ -99,7 +99,7 @@ bool CConstExpr::NeedsRecalculated()
 
 CExpression* CConstExpr::CheckLink(std::vector<CBrokenLinkInfo*>& brokenlinks)
 {
-// parent checks if child is still usefull. 
+// parent checks if child is still useful.
 // When for example it's value it's deleted flag set
 // then release Value, and return NULL in case of constexpression
 // else return this...
diff --git a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
index a795a4eddc6..7e496136ce2 100644
--- a/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
+++ b/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
@@ -146,7 +146,7 @@ bool KX_NetworkMessageSensor::Evaluate()
 	// Return always true if a message was received otherwise we can loose messages
 	if (m_IsUp)
 		return true;
-	// Is it usefull to return also true when the first frame without a message?? 
+	// Is it useful to return also true when the first frame without a message??
 	// This will cause a fast on/off cycle that seems useless!
 	return result;
 }