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

Merge branch 'master' of https://github.com/alexrj/slic3r

Browse Source
This commit is contained in:
Joseph Lenox 2018-02-08 16:36:56 -06:00
commit 084a7da3e1
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Slic3r/GUI/Plater.pm
View File

@ -248,7 +248,7 @@ sub new {
changescale arrow_out.png changescale arrow_out.png
split shape_ungroup.png split shape_ungroup.png
cut package.png cut package.png
layers cog.png layers variable_layer_height.png
settings cog.png settings cog.png
); );
for (grep $self->{"btn_$_"}, keys %icons) { for (grep $self->{"btn_$_"}, keys %icons) {
@ -2967,7 +2967,7 @@ sub object_menu {
}, undef, 'package.png'); }, undef, 'package.png');
wxTheApp->append_menu_item($menu, "Layer heights…", 'Open the dynamic layer height control', sub { wxTheApp->append_menu_item($menu, "Layer heights…", 'Open the dynamic layer height control', sub {
$self->object_layers_dialog; $self->object_layers_dialog;
}, undef, 'cog.png'); }, undef, 'variable_layer_height.png');
$menu->AppendSeparator(); $menu->AppendSeparator();
wxTheApp->append_menu_item($menu, "Settings…", 'Open the object editor dialog', sub { wxTheApp->append_menu_item($menu, "Settings…", 'Open the object editor dialog', sub {
$self->object_settings_dialog; $self->object_settings_dialog;

5
package/linux/startup_script.sh
View File

@ -1,5 +1,6 @@
#!/bin/bash #!/bin/bash
DIR=$(dirname "$0") BIN=$(readlink "$0")
export LD_LIBRARY_PATH=./bin DIR=$(dirname "$BIN")
export LD_LIBRARY_PATH="$DIR/bin"
exec "$DIR/perl-local" -I"$DIR/local-lib/lib/perl5" "$DIR/slic3r.pl" $@ exec "$DIR/perl-local" -I"$DIR/local-lib/lib/perl5" "$DIR/slic3r.pl" $@