manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- fixed a long list of possible crashes due to IsCurvatureEnabled calling IsCurvatureDirEnabled

This commit is contained in:
Guido Ranzuglia 2016-12-19 14:46:03 +01:00
parent c31be2edfc
commit 90dc1657d2
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
vcg/simplex/vertex/component_ocf.h
View File

@ -435,8 +435,17 @@ public:
ScalarTypeCur &Kh(){ assert((*this).Base().CurvatureEnabled); return (*this).Base().CuV[(*this).Index()][0]; }
ScalarTypeCur &Kg(){ assert((*this).Base().CurvatureEnabled); return (*this).Base().CuV[(*this).Index()][1]; }
ScalarTypeCur cKh() const { assert((*this).Base().CurvatureEnabled); return (*this).Base().CuV[(*this).Index()][0]; }
ScalarTypeCur cKg() const { assert((*this).Base().CurvatureEnabled); return (*this).Base().CuV[(*this).Index()][1]; }
ScalarTypeCur cKh() const
{
assert((*this).Base().CurvatureEnabled);
return (*this).Base().CuV[(*this).Index()][0];
}
ScalarTypeCur cKg() const
{
assert((*this).Base().CurvatureEnabled);
return (*this).Base().CuV[(*this).Index()][1];
}
template <class RightVertexType>
void ImportData(const RightVertexType & rightV){
@ -448,7 +457,11 @@ public:
TT::ImportData(rightV);
}
inline bool IsCurvatureEnabled( ) const { return this->Base().IsCurvatureDirEnabled(); }
inline bool IsCurvatureEnabled( ) const
{
return this->Base().IsCurvatureEnabled();
}
static bool HasCurvature() { return true; }
static bool HasCurvatureOcf() { return true; }
};