diff --git a/Common/Context.cpp b/Common/Context.cpp index cd8d6386d17dd6a565b97f8ca5660ea9793246f5..14c48277673e3670a4dc51880a5b92f1049b8237 100644 --- a/Common/Context.cpp +++ b/Common/Context.cpp @@ -87,7 +87,7 @@ CTX::CTX() color.mesh.carousel[i] = 0; } -CTX *CTX::_instance = 0; +CTX *CTX::_instance = NULL; CTX *CTX::instance() { diff --git a/Geo/MLine.cpp b/Geo/MLine.cpp index 3a25712ae19527c04f813825d4c7a679f50fed02..51063a51255bbbf93e9923526d55f0a27fa039e8 100644 --- a/Geo/MLine.cpp +++ b/Geo/MLine.cpp @@ -58,5 +58,5 @@ void MLine::getIntegrationPoints(int pOrder, int *npts, IntPt **pts) double MLine::getInnerRadius() { - return _v[0]->distance(_v[1]); + return _v[0]->distance(_v[1]) * .5; }