3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-11-02 20:51:23 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'master' of https://github.com/prusa3d/Slic3r into mesh_repair

Browse source
This commit is contained in:
Enrico Turri 2018-02-19 11:20:14 +01:00
commit 4dbd4d0316
5 changed files with 321 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
xs/src/libslic3r/PlaceholderParser.cpp
View file

@ -623,7 +623,7 @@ namespace client
expr<Iterator> &output)
{
if (opt.opt->is_vector())
ctx->throw_exception("Referencing a scalar variable in a vector context", opt.it_range);
ctx->throw_exception("Referencing a vector variable when scalar is expected", opt.it_range);
switch (opt.opt->type()) {
case coFloat: output.set_d(opt.opt->getFloat()); break;
case coInt: output.set_i(opt.opt->getInt()); break;
@ -648,7 +648,7 @@ namespace client
expr<Iterator> &output)
{
if (opt.opt->is_scalar())
ctx->throw_exception("Referencing a vector variable in a scalar context", opt.it_range);
ctx->throw_exception("Referencing a scalar variable when vector is expected", opt.it_range);
const ConfigOptionVectorBase *vec = static_cast<const ConfigOptionVectorBase*>(opt.opt);
if (vec->empty())
ctx->throw_exception("Indexing an empty vector variable", opt.it_range);