diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2018-09-28 21:39:04 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-28 21:39:04 +0200 |
| commit | 40c3c8745df3d08065802762e236beeaa6aa1345 (patch) | |
| tree | 24307e256b9c6cd973e5332b4b5b1959f1a10419 /modules/bullet/godot_ray_world_algorithm.cpp | |
| parent | dea0f69296f248d3294bdf11bd77eba212ce7d6c (diff) | |
| parent | 2091f204432d58f20a642bf9fab83a6d08a65084 (diff) | |
Merge pull request #22516 from akien-mga/fix-warnings
Fix warnings about wrong member initialization order [-Wreorder]
Diffstat (limited to 'modules/bullet/godot_ray_world_algorithm.cpp')
| -rw-r--r-- | modules/bullet/godot_ray_world_algorithm.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/bullet/godot_ray_world_algorithm.cpp b/modules/bullet/godot_ray_world_algorithm.cpp index 53d0ab7e3c..27ee44d1bd 100644 --- a/modules/bullet/godot_ray_world_algorithm.cpp +++ b/modules/bullet/godot_ray_world_algorithm.cpp @@ -49,9 +49,9 @@ GodotRayWorldAlgorithm::SwappedCreateFunc::SwappedCreateFunc(const btDiscreteDyn GodotRayWorldAlgorithm::GodotRayWorldAlgorithm(const btDiscreteDynamicsWorld *world, btPersistentManifold *mf, const btCollisionAlgorithmConstructionInfo &ci, const btCollisionObjectWrapper *body0Wrap, const btCollisionObjectWrapper *body1Wrap, bool isSwapped) : btActivatingCollisionAlgorithm(ci, body0Wrap, body1Wrap), + m_world(world), m_manifoldPtr(mf), m_ownManifold(false), - m_world(world), m_isSwapped(isSwapped) {} GodotRayWorldAlgorithm::~GodotRayWorldAlgorithm() { |