razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Hide most overlays on 3d view (#320)

Browse source
This commit is contained in:
Jeremy Bullock 2020-10-08 00:14:14 -06:00 committed by GitHub
parent e8bd04b132
commit 467272b64c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
toonz/sources/toonz/sceneviewer.cpp
View file

@ -1605,7 +1605,9 @@ void SceneViewer::drawOverlay() {
glPushMatrix();
tglMultMatrix(m_drawTableAff);
if (ViewerDraw::getShowFieldGuide()) ViewerDraw::drawFieldGuide();
ViewerDraw::drawGridsAndOverlays(this, m_pixelSize);
if (!m_draw3DMode) {
ViewerDraw::drawGridsAndOverlays(this, m_pixelSize);
}
glPopMatrix();
}
@ -1726,16 +1728,15 @@ void SceneViewer::drawOverlay() {
if (sl) {
std::vector<TPointD> assistantPoints =
sl->getProperties()->getVanishingPoints();
if (assistantPoints.size() > 0) {
if (!m_draw3DMode && assistantPoints.size() > 0) {
if (tool->getToolType() & TTool::LevelTool &&
!app->getCurrentObject()->isSpline() &&
(tool->getName() == "T_Brush" || tool->getName() == "T_Geometric")) {
glPushMatrix();
tglMultMatrix(getViewMatrix() * tool->getMatrix());
glScaled(m_dpiScale.x, m_dpiScale.y, 1);
ViewerDraw::drawPerspectiveGuides(
this, (m_draw3DMode) ? m_zoomScale3D : m_viewAff[m_viewMode].det(),
assistantPoints);
ViewerDraw::drawPerspectiveGuides(this, m_viewAff[m_viewMode].det(),
assistantPoints);
glPopMatrix();
}
}