diff options
| author | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-09-15 18:20:31 +0400 |
|---|---|---|
| committer | Andre Susano Pinto <andresusanopinto@gmail.com> | 2008-09-15 18:20:31 +0400 |
| commit | a1d611e9bd3379dd2c002cd5a895c788962a19a5 (patch) | |
| tree | 3c4bedb765464e1f2deadf2b1124c1228cd3d7e7 /source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h | |
| parent | 039ed9cb7f3edd2cae640065979aed4a7eb31103 (diff) | |
svn merge -r 16231:16536 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h')
| -rw-r--r-- | source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h index b5a61f72e4a..975be84f2a7 100644 --- a/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h +++ b/source/gameengine/Physics/Dummy/DummyPhysicsEnvironment.h @@ -69,8 +69,7 @@ public: return 0; } - virtual PHY_IPhysicsController* rayTest(PHY_IPhysicsController* ignoreClient, float fromX,float fromY,float fromZ, float toX,float toY,float toZ, - float& hitX,float& hitY,float& hitZ,float& normalX,float& normalY,float& normalZ); + virtual PHY_IPhysicsController* rayTest(PHY_IRayCastFilterCallback &filterCallback, float fromX,float fromY,float fromZ, float toX,float toY,float toZ); //gamelogic callbacks |