mirror of
https://git.mirrors.martin98.com/https://github.com/slic3r/Slic3r.git
synced 2025-07-31 07:12:05 +08:00
Merge remote-tracking branch 'remotes/origin/master' into alexrj_flagssurfacetype
This commit is contained in:
commit
7eb9c6e2bb
@ -59,7 +59,7 @@ matrix:
|
||||
- $HOME/wx302
|
||||
- local-lib
|
||||
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
|
||||
env:
|
||||
@ -95,7 +95,7 @@ matrix:
|
||||
- $HOME/Library/Caches/Homebrew
|
||||
- local-lib
|
||||
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
|
||||
osx_image: xcode9.4
|
||||
|
@ -1,6 +1,8 @@
|
||||
#!/bin/bash
|
||||
set -euo pipefail
|
||||
|
||||
source $HOME/perl5/perlbrew/etc/bashrc
|
||||
perlbrew switch slic3r-perl
|
||||
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
|
||||
|
||||
|
@ -230,7 +230,7 @@ Print::make_skirt()
|
||||
skirts = 1;
|
||||
|
||||
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};
|
||||
if (this->config.min_skirt_length() > 0)
|
||||
for (auto i : extruders)
|
||||
|
Loading…
x
Reference in New Issue
Block a user