Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/supermerill/SuperSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEnrico Turri <enricoturri@seznam.cz>2019-02-08 18:45:03 +0300
committerEnrico Turri <enricoturri@seznam.cz>2019-02-08 18:45:03 +0300
commit7662fa9a5b599268a015c45863947021eea2c14a (patch)
treec9cc9ce8174dfac23aac394827568b0a7c889ace
parent8b2a8822d250fe5ee78f98ae1c8b55029c39d173 (diff)
Temporary disable transparent bed and higher resolution bed texturesversion_1.42.0-alpha6
-rw-r--r--src/slic3r/GUI/3DScene.cpp2
-rw-r--r--src/slic3r/GUI/GLCanvas3D.cpp4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/slic3r/GUI/3DScene.cpp b/src/slic3r/GUI/3DScene.cpp
index 595f6f6a8..6b1df6ab3 100644
--- a/src/slic3r/GUI/3DScene.cpp
+++ b/src/slic3r/GUI/3DScene.cpp
@@ -2003,7 +2003,7 @@ bool GLBed::on_init_from_file(const std::string& filename, bool useVBOs)
else
m_volume.indexed_vertex_array.load_mesh_flat_shading(mesh);
- float color[4] = { 0.235f, 0.235f, 0.235f, 0.5f };
+ float color[4] = { 0.235f, 0.235f, 0.235f, 1.0f };
set_color(color, 4);
m_volume.bounding_box = m_volume.indexed_vertex_array.bounding_box();
diff --git a/src/slic3r/GUI/GLCanvas3D.cpp b/src/slic3r/GUI/GLCanvas3D.cpp
index 8facf3879..69a3ea2bd 100644
--- a/src/slic3r/GUI/GLCanvas3D.cpp
+++ b/src/slic3r/GUI/GLCanvas3D.cpp
@@ -599,6 +599,10 @@ void GLCanvas3D::Bed::_render_prusa(const std::string &key, float theta) const
// use higher resolution images if graphic card allows
GLint max_tex_size;
::glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_tex_size);
+
+ // temporary set to lowest resolution
+ max_tex_size = 2048;
+
if (max_tex_size >= 8192)
tex_path += "_8192";
else if (max_tex_size >= 4096)