Tech ENABLE_INSTANCE_COORDINATES_FOR_VOLUMES - Mirror transform in local system for volumes and a few fixes in rotation
Fixed conflicts during rebase with master
This commit is contained in:
parent
fb31bcd0f0
commit
6e92b4fc3b
3 changed files with 9 additions and 3 deletions
|
@ -327,6 +327,10 @@ void GLGizmoRotate::init_data_from_selection(const Selection& selection)
|
|||
const GLVolume& v = *selection.get_volume(*selection.get_volume_idxs().begin());
|
||||
m_orient_matrix = v.get_instance_transformation().get_matrix(true, false, true, true) * v.get_volume_transformation().get_matrix(true, false, true, true);
|
||||
}
|
||||
else {
|
||||
const GLVolume& v = *selection.get_volume(*selection.get_volume_idxs().begin());
|
||||
m_orient_matrix = v.get_instance_transformation().get_matrix(true, false, true, true);
|
||||
}
|
||||
#else
|
||||
if (wxGetApp().obj_manipul()->get_world_coordinates())
|
||||
m_orient_matrix = Transform3d::Identity();
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue