diff options
| author | Anton Yabchinskiy <arn@bestmx.ru> | 2014-12-23 23:44:07 +0300 |
|---|---|---|
| committer | Anton Yabchinskiy <arn@bestmx.ru> | 2014-12-23 23:44:07 +0300 |
| commit | 4ab1bcde35a02cfe7b25d630720de1cc81ef5a1a (patch) | |
| tree | b476b0f4aa8df1801361a04390c98cf0e2e3d98b /scene/3d | |
| parent | ff755f93eb86e3f7f6801918457ca77a3001671b (diff) | |
| parent | 530d717a67cc3acab10270dca700db328aa12891 (diff) | |
Merge branch 'master' of github.com:okamstudio/godot
Conflicts:
drivers/SCsub
platform/x11/detect.py
platform/x11/os_x11.h
Diffstat (limited to 'scene/3d')
| -rw-r--r-- | scene/3d/physics_body.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/scene/3d/physics_body.cpp b/scene/3d/physics_body.cpp index 21ecac6e3d..5c047b3fef 100644 --- a/scene/3d/physics_body.cpp +++ b/scene/3d/physics_body.cpp @@ -870,6 +870,9 @@ Vector3 KinematicBody::move(const Vector3& p_motion) { for(int j=0;j<8;j++) { for(int i=0;i<res_shapes;i++) { + if (is_shape_set_as_trigger(i)) + continue; + Vector3 a = sr[i*2+0]; Vector3 b = sr[i*2+1]; //print_line(String()+a+" -> "+b); @@ -930,6 +933,8 @@ Vector3 KinematicBody::move(const Vector3& p_motion) { for(int i=0;i<get_shape_count();i++) { + if (is_shape_set_as_trigger(i)) + continue; float lsafe,lunsafe; PhysicsDirectSpaceState::ShapeRestInfo lrest; @@ -1041,6 +1046,8 @@ bool KinematicBody::can_move_to(const Vector3& p_position, bool p_discrete) { //fill exclude list.. for(int i=0;i<get_shape_count();i++) { + if (is_shape_set_as_trigger(i)) + continue; bool col = dss->intersect_shape(get_shape(i)->get_rid(), xform * get_shape_transform(i),0,NULL,0,exclude,get_layer_mask(),mask); if (col) |