From 5f72e9c763e328dee6fa8591b40d2fa09f58539b Mon Sep 17 00:00:00 2001 From: Sam Edwards Date: Sun, 2 Sep 2018 15:37:10 -0600 Subject: [PATCH] bullet: Fix misplaced INLINE getter --- panda/src/bullet/bulletSoftBodyMaterial.I | 9 +++++++++ panda/src/bullet/bulletSoftBodyMaterial.cxx | 9 --------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/panda/src/bullet/bulletSoftBodyMaterial.I b/panda/src/bullet/bulletSoftBodyMaterial.I index 7514fc7cbf..13326a54d9 100644 --- a/panda/src/bullet/bulletSoftBodyMaterial.I +++ b/panda/src/bullet/bulletSoftBodyMaterial.I @@ -30,3 +30,12 @@ empty() { return BulletSoftBodyMaterial(material); } + +/** + * + */ +INLINE btSoftBody::Material &BulletSoftBodyMaterial:: +get_material() const { + + return _material; +} diff --git a/panda/src/bullet/bulletSoftBodyMaterial.cxx b/panda/src/bullet/bulletSoftBodyMaterial.cxx index a7a66a5f62..052cd5a8aa 100644 --- a/panda/src/bullet/bulletSoftBodyMaterial.cxx +++ b/panda/src/bullet/bulletSoftBodyMaterial.cxx @@ -23,15 +23,6 @@ BulletSoftBodyMaterial(btSoftBody::Material &material) : _material(material) { } -/** - * - */ -btSoftBody::Material &BulletSoftBodyMaterial:: -get_material() const { - - return _material; -} - /** * Getter for the property m_kLST. */