diff options
author | Andrea Catania <info@andreacatania.com> | 2019-06-03 12:54:19 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-06-03 12:54:19 +0200 |
commit | 960cadd9192f8e8460def8192b9b0f850040f5d3 (patch) | |
tree | 4aebd5ea81555bedf0107ac951903912567e192a | |
parent | 500264ca239d3fdf69162c75c5b40ee04baae458 (diff) | |
download | bullet3-960cadd9192f8e8460def8192b9b0f850040f5d3.tar.gz |
Fix initialization order
This commit is necessary in order to fix the error that we get in godot with the flag: "-Werror=reorder"
-rw-r--r-- | src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h b/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h index 542ea23c9..2b88e25be 100644 --- a/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h +++ b/src/BulletDynamics/ConstraintSolver/btSequentialImpulseConstraintSolver.h @@ -80,11 +80,11 @@ struct btSISolverSingleIterationData m_orderNonContactConstraintPool(orderNonContactConstraintPool), m_orderFrictionConstraintPool(orderFrictionConstraintPool), m_tmpConstraintSizesPool(tmpConstraintSizesPool), + m_seed(seed), m_resolveSingleConstraintRowGeneric(resolveSingleConstraintRowGeneric), m_resolveSingleConstraintRowLowerLimit(resolveSingleConstraintRowLowerLimit), m_resolveSplitPenetrationImpulse(resolveSplitPenetrationImpulse), m_kinematicBodyUniqueIdToSolverBodyTable(kinematicBodyUniqueIdToSolverBodyTable), - m_seed(seed), m_fixedBodyId(fixedBodyId), m_maxOverrideNumSolverIterations(maxOverrideNumSolverIterations) { @@ -320,4 +320,4 @@ public: btSolverAnalyticsData m_analyticsData; }; -#endif //BT_SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_H
\ No newline at end of file +#endif //BT_SEQUENTIAL_IMPULSE_CONSTRAINT_SOLVER_H |