diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-09-13 12:50:54 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-09-13 12:50:54 +0400 |
commit | f9694287d9a9a2ca5d031d6fbf4aa05045944ecc (patch) | |
tree | fce5ed31decd6cd98aa25d3a35e1c116b98bcd6a /source/gameengine/Ketsji/KX_NearSensor.h | |
parent | 7eea0b647cbfa7cadec14b07b696bf10830189e8 (diff) |
svn merge https://svn.blender.org/svnroot/bf-blender/branches/blender2.4 -r23172:HEAD
merging now to save confusion later since the changes between last merge and 23172 shouldn't be merged.
brings 2.4 and trunk in sync aside from sequencer edits from Peter.
Diffstat (limited to 'source/gameengine/Ketsji/KX_NearSensor.h')
-rw-r--r-- | source/gameengine/Ketsji/KX_NearSensor.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source/gameengine/Ketsji/KX_NearSensor.h b/source/gameengine/Ketsji/KX_NearSensor.h index 03d6f830579..4f0247d209d 100644 --- a/source/gameengine/Ketsji/KX_NearSensor.h +++ b/source/gameengine/Ketsji/KX_NearSensor.h @@ -68,6 +68,7 @@ public: virtual void SynchronizeTransform(); virtual CValue* GetReplica(); virtual void ProcessReplica(); + virtual void SetPhysCtrlRadius(); virtual bool Evaluate(); virtual void ReParent(SCA_IObject* parent); @@ -91,6 +92,8 @@ public: if (sensor->m_Margin > sensor->m_ResetMargin) sensor->m_ResetMargin = sensor->m_Margin; + sensor->SetPhysCtrlRadius(); + return 0; } |