Merge branch 'master' into et_world_coordinates

This commit is contained in:
Vojtech Bubnik 2022-03-23 14:05:33 +01:00
commit fe71e7c597
23 changed files with 638 additions and 227 deletions

View file

@ -195,8 +195,7 @@ void GLGizmoRotate::on_render()
#if ENABLE_GL_SHADERS_ATTRIBUTES
const Camera& camera = wxGetApp().plater()->get_camera();
Transform3d view_model_matrix = camera.get_view_matrix() * m_grabbers.front().matrix;
const Transform3d view_model_matrix = camera.get_view_matrix() * m_grabbers.front().matrix;
shader->set_uniform("view_model_matrix", view_model_matrix);
shader->set_uniform("projection_matrix", camera.get_projection_matrix());
#endif // ENABLE_GL_SHADERS_ATTRIBUTES