Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKent Mein <mein@cs.umn.edu>2007-06-26 00:15:36 +0400
committerKent Mein <mein@cs.umn.edu>2007-06-26 00:15:36 +0400
commit22ef0daefd5ea9e71131050eb724f2c894fde648 (patch)
tree9aca1628a28545a44dd0b101854681d6312fbc63 /source/gameengine
parent613646b33e5fde13158a8d8644df8c97bdde2fbb (diff)
This is patch #6825 (The patch missed a couple of them but
this should get it all. recurse was spelled resurse in a couple of places. Kent
Diffstat (limited to 'source/gameengine')
-rw-r--r--source/gameengine/Ketsji/KX_GameObject.h2
-rw-r--r--source/gameengine/Ketsji/KX_IpoActuator.cpp6
-rw-r--r--source/gameengine/SceneGraph/SG_Node.h2
3 files changed, 5 insertions, 5 deletions
diff --git a/source/gameengine/Ketsji/KX_GameObject.h b/source/gameengine/Ketsji/KX_GameObject.h
index f3bf529a37d..db910a46a81 100644
--- a/source/gameengine/Ketsji/KX_GameObject.h
+++ b/source/gameengine/Ketsji/KX_GameObject.h
@@ -416,7 +416,7 @@ public:
void
UpdateIPO(
float curframetime,
- bool resurse,
+ bool recurse,
bool ipo_as_force,
bool force_ipo_local
);
diff --git a/source/gameengine/Ketsji/KX_IpoActuator.cpp b/source/gameengine/Ketsji/KX_IpoActuator.cpp
index b72e29e955f..e7f1dea7bbf 100644
--- a/source/gameengine/Ketsji/KX_IpoActuator.cpp
+++ b/source/gameengine/Ketsji/KX_IpoActuator.cpp
@@ -66,7 +66,7 @@ STR_String KX_IpoActuator::S_KX_ACT_IPO_FROM_PROP_STRING = "FromProp";
class CIpoAction : public CAction
{
float m_curtime;
- bool m_resurse;
+ bool m_recurse;
KX_GameObject* m_gameobj;
bool m_ipo_as_force;
bool m_force_ipo_local;
@@ -78,7 +78,7 @@ public:
bool ipo_as_force,
bool force_ipo_local) :
m_curtime(curtime) ,
- m_resurse(recurse),
+ m_recurse(recurse),
m_gameobj(gameobj),
m_ipo_as_force(ipo_as_force),
m_force_ipo_local(force_ipo_local)
@@ -90,7 +90,7 @@ public:
{
m_gameobj->UpdateIPO(
m_curtime,
- m_resurse,
+ m_recurse,
m_ipo_as_force,
m_force_ipo_local);
};
diff --git a/source/gameengine/SceneGraph/SG_Node.h b/source/gameengine/SceneGraph/SG_Node.h
index ef5af717d60..7ba13cc0a87 100644
--- a/source/gameengine/SceneGraph/SG_Node.h
+++ b/source/gameengine/SceneGraph/SG_Node.h
@@ -173,7 +173,7 @@ public:
void
SetSimulatedTime(
double time,
- bool resurse
+ bool recurse
);
/**