GitHub-Proxy/OrcaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-15 00:05:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
YuSanka 2018-05-03 09:22:10 +02:00
commit 20d9bda87e
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Slic3r/GUI/3DScene.pm
View File

@ -1152,11 +1152,7 @@ sub InitGL {
$self->volumes->finalize_geometry(1) $self->volumes->finalize_geometry(1)
if ($^O eq 'linux' && $self->UseVBOs); if ($^O eq 'linux' && $self->UseVBOs);
if (scalar @{$self->volumes} > 0) {
$self->zoom_to_volumes;
} else {
$self->zoom_to_bed; $self->zoom_to_bed;
}
glClearColor(0, 0, 0, 1); glClearColor(0, 0, 0, 1);
glColor3f(1, 0, 0); glColor3f(1, 0, 0);

5
xs/src/slic3r/Utils/PresetUpdater.cpp
View File

@ -359,6 +359,11 @@ Updates PresetUpdater::priv::get_config_updates() const
const auto cached_vp = VendorProfile::from_ini(path_in_cache, false); const auto cached_vp = VendorProfile::from_ini(path_in_cache, false);
if (cached_vp.config_version == recommended->config_version) { if (cached_vp.config_version == recommended->config_version) {
updates.updates.emplace_back(std::move(path_in_cache), std::move(bundle_path), *recommended); updates.updates.emplace_back(std::move(path_in_cache), std::move(bundle_path), *recommended);
} else {
BOOST_LOG_TRIVIAL(warning) << boost::format("Vendor: %1%: Index indicates update (%2%) but cached bundle has a different version: %3%")
% idx.vendor()
% recommended->config_version.to_string()
% cached_vp.config_version.to_string();
} }
} }
} }