From 22a4ddfbd480cb662162a2692bbbc5187981a4bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Sat, 4 May 2013 16:29:15 +0200 Subject: [PATCH] Physics shape rework #6: removed unneded overload, fixed the original. --- src/Physics/AbstractShape.cpp | 2 +- src/Physics/Shape.h | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/Physics/AbstractShape.cpp b/src/Physics/AbstractShape.cpp index 0070ca5da..08cd192ac 100644 --- a/src/Physics/AbstractShape.cpp +++ b/src/Physics/AbstractShape.cpp @@ -52,7 +52,7 @@ template bool AbstractShape::collides(const } template void AbstractShape::markDirty() { - group()->setDirty(); + if(group()) group()->setDirty(); } #ifndef DOXYGEN_GENERATING_OUTPUT diff --git a/src/Physics/Shape.h b/src/Physics/Shape.h index 75127b2dd..ebf62d3ff 100644 --- a/src/Physics/Shape.h +++ b/src/Physics/Shape.h @@ -102,9 +102,6 @@ template class MAGNUM_PHYSICS_EXPORT Shape: public AbstractShape::MatrixType& absoluteTransformationMatrix) override; @@ -127,10 +124,6 @@ template inline const T& Shape::transformedShape() { return _transformedShape.shape; } -template void Shape::markDirty() { - if(this->group()) this->group()->setDirty(); -} - template void Shape::clean(const typename DimensionTraits::MatrixType& absoluteTransformationMatrix) { Implementation::ShapeHelper::transform(*this, absoluteTransformationMatrix); }