GitHub-Proxy/Slic3r
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git synced 2025-08-01 04:21:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/master' into alexrj_flagssurfacetype

Browse Source
This commit is contained in:
supermerill 2018-11-29 11:21:11 +01:00
commit 7eb9c6e2bb
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -59,7 +59,7 @@ matrix:
- $HOME/wx302 - $HOME/wx302
- local-lib - local-lib
after_success: after_success:
- if [[ "${TRAVIS_BRANCH}" != "cppgui" ]]; then ./package/linux/travis-deploy-main.sh; fi - if [[ "${TRAVIS_BRANCH}" != "cppgui" ]]; then ./package/linux/travis-deploy-main.sh || travis_terminate 1; fi
- os: linux - os: linux
env: env:
@ -95,7 +95,7 @@ matrix:
- $HOME/Library/Caches/Homebrew - $HOME/Library/Caches/Homebrew
- local-lib - local-lib
after_success: after_success:
- if [[ "${TRAVIS_BRANCH}" != "cppgui" ]]; then ./package/osx/travis-deploy-main.sh; fi - if [[ "${TRAVIS_BRANCH}" != "cppgui" ]]; then ./package/osx/travis-deploy-main.sh || travis_terminate 1; fi
- os: osx - os: osx
osx_image: xcode9.4 osx_image: xcode9.4

2
package/linux/travis-deploy-main.sh
View File

@ -1,6 +1,8 @@
#!/bin/bash #!/bin/bash
set -euo pipefail set -euo pipefail
source $HOME/perl5/perlbrew/etc/bashrc
perlbrew switch slic3r-perl
eval $(perl -Mlocal::lib=$TRAVIS_BUILD_DIR/local-lib) eval $(perl -Mlocal::lib=$TRAVIS_BUILD_DIR/local-lib)
cd package/linux && make -f build_shell.mk && mv Slic3r* $TRAVIS_BUILD_DIR && cd $TRAVIS_BUILD_DIR cd package/linux && make -f build_shell.mk && mv Slic3r* $TRAVIS_BUILD_DIR && cd $TRAVIS_BUILD_DIR

2
xs/src/libslic3r/Print.cpp
View File

@ -230,7 +230,7 @@ Print::make_skirt()
skirts = 1; skirts = 1;
const std::set<size_t> extruders{ this->extruders() }; const std::set<size_t> extruders{ this->extruders() };
auto extruder_it { extruders.begin() }; auto extruder_it = extruders.begin();
std::vector<float> e_per_mm{0}, extruded_length{0}; std::vector<float> e_per_mm{0}, extruded_length{0};
if (this->config.min_skirt_length() > 0) if (this->config.min_skirt_length() > 0)
for (auto i : extruders) for (auto i : extruders)