3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-07-19 12:47:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
bubnikv 2018-03-14 16:16:18 +01:00
commit 757b0788ae
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
doc/deps-build/unix-static/Makefile
View file

@ -67,13 +67,17 @@ $(TBB).tar.gz:
curl -L -o $@ https://github.com/wjakob/tbb/archive/$(TBB_SHA).tar.gz curl -L -o $@ https://github.com/wjakob/tbb/archive/$(TBB_SHA).tar.gz
# Note: libcurl build system seems to be a bit wonky about finding openssl (cf. #2378).
# It seems that currently the only working option is to set a prefix in the openssl build
# and use the `--with-ssl=...` option in libcurl.
# Additionally, pkg-config needs to be installed and openssl libs need to NOT be installed on the build system.
libopenssl: $(OPENSSL).tar.gz libopenssl: $(OPENSSL).tar.gz
tar -zxvf $(OPENSSL).tar.gz tar -zxvf $(OPENSSL).tar.gz
cd $(OPENSSL) && ./config --openssldir=/etc/ssl shared no-ssl3-method no-dynamic-engine '-Wa,--noexecstack' cd $(OPENSSL) && ./config --prefix=$(DESTDIR)/usr/local no-shared no-ssl3-method no-dynamic-engine '-Wa,--noexecstack'
make -C $(OPENSSL) depend $(MAKE) -C $(OPENSSL) depend
make -C $(OPENSSL) -j$(NPROC) $(MAKE) -C $(OPENSSL) -j$(NPROC)
make -C $(OPENSSL) install DESTDIR=$(DESTDIR) $(MAKE) -C $(OPENSSL) install_sw
$(OPENSSL).tar.gz: $(OPENSSL).tar.gz:
curl -L -o $@ 'https://github.com/openssl/openssl/archive/OpenSSL_1_1_0g.tar.gz' curl -L -o $@ 'https://github.com/openssl/openssl/archive/OpenSSL_1_1_0g.tar.gz'
@ -82,10 +86,9 @@ $(OPENSSL).tar.gz:
libcurl: libopenssl $(CURL).tar.gz libcurl: libopenssl $(CURL).tar.gz
tar -zxvf $(CURL).tar.gz tar -zxvf $(CURL).tar.gz
# Note: It seems setting custom openssl path doesn't work when pkg-config and system openssl devel libs are installed
cd $(CURL) && ./configure \ cd $(CURL) && ./configure \
--enable-static \ --enable-static \
--enable-shared \ --disable-shared \
--with-ssl=$(DESTDIR)/usr/local \ --with-ssl=$(DESTDIR)/usr/local \
--with-pic \ --with-pic \
--enable-ipv6 \ --enable-ipv6 \

9
xs/src/slic3r/GUI/Tab.cpp
View file

@ -737,7 +737,7 @@ void TabPrint::update()
fill_density = 100; fill_density = 100;
} }
else else
fill_density = 40; fill_density = m_presets->get_selected_preset().config.option<ConfigOptionPercent>("fill_density")->value;
new_conf.set_key_value("fill_density", new ConfigOptionPercent(fill_density)); new_conf.set_key_value("fill_density", new ConfigOptionPercent(fill_density));
load_config(new_conf); load_config(new_conf);
on_value_change("fill_density", fill_density); on_value_change("fill_density", fill_density);
@ -1431,10 +1431,11 @@ void Tab::load_current_preset()
update_tab_ui(); update_tab_ui();
on_presets_changed(); on_presets_changed();
if (name() == "print"){ if (name() == "print")
update_frequently_changed_parameters(); update_frequently_changed_parameters();
update_changed_ui(); if (m_name == "printer")
} static_cast<TabPrinter*>(this)->m_initial_extruders_count = static_cast<TabPrinter*>(this)->m_extruders_count;
update_changed_ui();
}); });
} }