feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/7.0'

Browse Source 
Change-Id: I7037b2b400617b0be0e1a010dd293e4f96d77328
This commit is contained in:
Eike Ziller
2022-05-23 12:26:27 +02:00
parent 21d0175dab 2e8bfee966
commit f14b1a484a
35 changed files with 363 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/qmldesigner/components/edit3d/edit3dview.cpp
View File

@@ -220,8 +220,10 @@ void Edit3DView::modelAboutToBeDetached(Model *model)
QTC_ASSERT(edit3DWidget()->canvas(), return);
// Hide the canvas when model is detached (i.e. changing documents)
m_canvasCache.insert(model, edit3DWidget()->canvas()->renderImage());
edit3DWidget()->showCanvas(false);
if (edit3DWidget() && edit3DWidget()->canvas()) {
m_canvasCache.insert(model, edit3DWidget()->canvas()->renderImage());
edit3DWidget()->showCanvas(false);
}
AbstractView::modelAboutToBeDetached(model);
}