FIX:delete unnecessary render_background
jira: STUDIO-7828 Change-Id: I7a42ab65f260b983b8ea1653e3e23b3eab8c15fd (cherry picked from commit 8f5a5f0dde012f51ce2c3d8997df4bf808ad216a)
This commit is contained in:
parent
68625a6e60
commit
498face4d6
|
@ -4707,7 +4707,6 @@ void PartPlateList::render_instance(bool bottom, bool only_current, bool only_bo
|
||||||
shader->set_uniform("view_model_matrix", view_mat * m_plate_trans[m_current_plate].get_matrix());
|
shader->set_uniform("view_model_matrix", view_mat * m_plate_trans[m_current_plate].get_matrix());
|
||||||
shader->set_uniform("projection_matrix", proj_mat);
|
shader->set_uniform("projection_matrix", proj_mat);
|
||||||
if (!bottom) { // draw background
|
if (!bottom) { // draw background
|
||||||
render_background(force_background_color); // for selected_plate
|
|
||||||
render_exclude_area(force_background_color); // for selected_plate
|
render_exclude_area(force_background_color); // for selected_plate
|
||||||
}
|
}
|
||||||
render_grid(bottom); // for selected_plate
|
render_grid(bottom); // for selected_plate
|
||||||
|
@ -4783,17 +4782,6 @@ void PartPlateList::render_instance_background(bool force_default_color)
|
||||||
m_triangles.render_geometry_instance(m_unselected_plate_mats_vbo, m_unselected_plate_trans.size());
|
m_triangles.render_geometry_instance(m_unselected_plate_mats_vbo, m_unselected_plate_trans.size());
|
||||||
}
|
}
|
||||||
|
|
||||||
void PartPlateList::render_background(bool force_default_color) {
|
|
||||||
ColorRGBA color;
|
|
||||||
if (!force_default_color) {
|
|
||||||
color = PartPlate::SELECT_COLOR;
|
|
||||||
} else {
|
|
||||||
color = PartPlate::DEFAULT_COLOR;
|
|
||||||
}
|
|
||||||
m_triangles.set_color(color);
|
|
||||||
m_triangles.render_geometry();
|
|
||||||
}
|
|
||||||
|
|
||||||
void PartPlateList::render_exclude_area(bool force_default_color)
|
void PartPlateList::render_exclude_area(bool force_default_color)
|
||||||
{
|
{
|
||||||
if (force_default_color || !m_exclude_triangles.is_initialized()) // for thumbnail case
|
if (force_default_color || !m_exclude_triangles.is_initialized()) // for thumbnail case
|
||||||
|
|
|
@ -815,7 +815,6 @@ public:
|
||||||
void render_instance_grid(bool bottom);
|
void render_instance_grid(bool bottom);
|
||||||
void render_instance_background(bool force_default_color = false);
|
void render_instance_background(bool force_default_color = false);
|
||||||
void render_grid(bool bottom);
|
void render_grid(bool bottom);
|
||||||
void render_background(bool force_default_color = false);
|
|
||||||
void render_exclude_area(bool force_default_color);
|
void render_exclude_area(bool force_default_color);
|
||||||
void render_instance_exclude_area(bool force_default_color);
|
void render_instance_exclude_area(bool force_default_color);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue