Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
allow invalid Z value with transform mesh vertex by expression
  • Loading branch information
vcloarec committed Nov 15, 2021
1 parent 5540740 commit 03d5c64
Showing 1 changed file with 8 additions and 11 deletions.
19 changes: 8 additions & 11 deletions src/core/mesh/qgsmeshadvancedediting.cpp
Expand Up @@ -727,19 +727,16 @@ bool QgsMeshTransformVerticesByExpression::calculate( QgsMeshLayer *layer )

if ( calcZ )
{
double z = std::numeric_limits<double>::quiet_NaN();
if ( zvar.isValid() )
{
double z = zvar.toDouble( &ok );
if ( ok )
{
mNewZValues.append( z );
mOldZValues.append( vert.z() );
}
else
return false;
z = zvar.toDouble( &ok );
if ( !ok )
z = std::numeric_limits<double>::quiet_NaN();
}
else
return false;

mNewZValues.append( z );
mOldZValues.append( vert.z() );
}
}

Expand All @@ -749,7 +746,7 @@ bool QgsMeshTransformVerticesByExpression::calculate( QgsMeshLayer *layer )
};

mNativeFacesIndexesGeometryChanged = qgis::setToList( concernedFaces );
return layer->meshEditor()->canBeTransformed( mNativeFacesIndexesGeometryChanged, transformFunction );
return ( !calcX && !calcY ) || layer->meshEditor()->canBeTransformed( mNativeFacesIndexesGeometryChanged, transformFunction );
}

QString QgsMeshTransformVerticesByExpression::text() const
Expand Down

0 comments on commit 03d5c64

Please sign in to comment.