mozhe
/
BambuStudio
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

FIX:GLWipeTowerVolume's render should inherit parent class 

Jira: STUDIO-6545
Change-Id: Iee9a7e7cc93785e736e56760640c8315af472c6a
This commit is contained in:
zhou.xu 2024-03-27 13:03:53 +08:00 committed by Lane.Wei
parent 8c95aca226
commit 9c10410f19
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/slic3r/GUI/3DScene.cpp
View File

@ -1016,7 +1016,7 @@ GLWipeTowerVolume::GLWipeTowerVolume(const std::vector<std::array<float, 4>>& co
m_colors = colors; m_colors = colors;
} }
void GLWipeTowerVolume::render(bool with_outline) const void GLWipeTowerVolume::render(bool with_outline,const std::array<float, 4> &body_color) const
{ {
if (!is_active) if (!is_active)
return; return;

2
src/slic3r/GUI/3DScene.hpp
View File

@ -560,7 +560,7 @@ public:
class GLWipeTowerVolume : public GLVolume { class GLWipeTowerVolume : public GLVolume {
public: public:
GLWipeTowerVolume(const std::vector<std::array<float, 4>>& colors); GLWipeTowerVolume(const std::vector<std::array<float, 4>>& colors);
virtual void render(bool with_outline = false) const; virtual void render(bool with_outline = false, const std::array<float, 4> &body_color = {1.0f, 1.0f, 1.0f, 1.0f}) const;
std::vector<GLIndexedVertexArray> iva_per_colors; std::vector<GLIndexedVertexArray> iva_per_colors;
bool IsTransparent(); bool IsTransparent();