suzanne.soy/solvespace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix a crash when extruding TTF text.

Browse Source
This commit is contained in:
EvilSpirit 2016-11-21 21:37:35 +07:00 committed by whitequark
parent 43629549c1
commit aaab8a09d4
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/entity.cpp
View File

@ -568,6 +568,10 @@ void EntityBase::PointGetExprsInWorkplane(hEntity wrkpl, Expr **u, Expr **v) con
} }
ExprVector EntityBase::PointGetExprsInWorkplane(hEntity wrkpl) const { ExprVector EntityBase::PointGetExprsInWorkplane(hEntity wrkpl) const {
if(wrkpl.v == Entity::FREE_IN_3D.v) {
return PointGetExprs();
}
ExprVector r; ExprVector r;
PointGetExprsInWorkplane(wrkpl, &r.x, &r.y); PointGetExprsInWorkplane(wrkpl, &r.x, &r.y);
r.z = Expr::From(0.0); r.z = Expr::From(0.0);
@ -824,6 +828,7 @@ void EntityBase::GenerateEquations(IdList<Equation,hEquation> *l) const {
} }
case Type::TTF_TEXT: { case Type::TTF_TEXT: {
if(SK.GetEntity(point[0])->type != Type::POINT_IN_2D) break;
EntityBase *b = SK.GetEntity(point[2]); EntityBase *b = SK.GetEntity(point[2]);
EntityBase *c = SK.GetEntity(point[3]); EntityBase *c = SK.GetEntity(point[3]);
ExprVector eb = b->PointGetExprsInWorkplane(workplane); ExprVector eb = b->PointGetExprsInWorkplane(workplane);