Fixed differences after rebase to master
This commit is contained in:
parent
456e61c7d3
commit
210273e12f
1 changed files with 6 additions and 9 deletions
|
@ -866,15 +866,12 @@ void GLGizmoMeasure::on_render()
|
|||
}
|
||||
case Measure::SurfaceFeatureType::Plane:
|
||||
{
|
||||
// no need to render the plane in case it is rendered with the same color as the volume in the 3D scene
|
||||
if (colors.front() != m_parent.get_selection().get_first_volume()->render_color) {
|
||||
const auto& [idx, normal, pt] = feature.get_plane();
|
||||
assert(idx < m_plane_models_cache.size());
|
||||
set_matrix_uniforms(Transform3d::Identity());
|
||||
set_emission_uniform(colors.front(), hover);
|
||||
m_plane_models_cache[idx].set_color(colors.front());
|
||||
m_plane_models_cache[idx].render();
|
||||
}
|
||||
const auto& [idx, normal, pt] = feature.get_plane();
|
||||
assert(idx < m_plane_models_cache.size());
|
||||
set_matrix_uniforms(Transform3d::Identity());
|
||||
set_emission_uniform(colors.front(), hover);
|
||||
m_plane_models_cache[idx].set_color(colors.front());
|
||||
m_plane_models_cache[idx].render();
|
||||
if (update_raycasters_transform) {
|
||||
auto it = m_raycasters.find(PLANE_ID);
|
||||
if (it != m_raycasters.end() && it->second != nullptr)
|
||||
|
|
Loading…
Reference in a new issue