diff options
| author | Juan Linietsky <reduzio@gmail.com> | 2015-03-22 14:56:30 -0300 |
|---|---|---|
| committer | Juan Linietsky <reduzio@gmail.com> | 2015-03-22 14:56:30 -0300 |
| commit | c2d975582c7820f9fd17df1212c6e26c64e620c9 (patch) | |
| tree | 74f45e8016dd2fea3e3ca9c3c44f0ed9aaf8e42e | |
| parent | 6d813c81b814da2a0cfaf6a6f879020e66e90bb9 (diff) | |
| parent | 69cf996ce60f9419922b0de4590b7ece7fa0a8be (diff) | |
Merge pull request #1446 from UsernameIsAReservedWord/fixes_kinematicbody_move_crash
should fixes #1284 (KinematicBody .move() crash)
| -rw-r--r-- | servers/physics/shape_sw.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/servers/physics/shape_sw.h b/servers/physics/shape_sw.h index cdb21556b8..bcf8fbdc8d 100644 --- a/servers/physics/shape_sw.h +++ b/servers/physics/shape_sw.h @@ -438,7 +438,7 @@ struct MotionShapeSW : public ShapeSW { } return support; } - virtual void get_supports(const Vector3& p_normal,int p_max,Vector3 *r_supports,int & r_amount) const {} + virtual void get_supports(const Vector3& p_normal,int p_max,Vector3 *r_supports,int & r_amount) const { r_amount=0; } bool intersect_segment(const Vector3& p_begin,const Vector3& p_end,Vector3 &r_result, Vector3 &r_normal) const { return false; } Vector3 get_moment_of_inertia(float p_mass) const { return Vector3(); } |