diff options
| author | Sergey Dubitskiy <sergey.dubitskiy@nokia.com> | 2012-02-13 14:27:29 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-14 01:37:52 +0100 |
| commit | 35e1fc8ae0ef05eb59c55de707813233757de456 (patch) | |
| tree | 943869f40c9f571840749d79f2b0265a52fae5b8 /examples/qt3d/builder/builder.cpp | |
| parent | 00d127f73034c0aa4b21db5ef13490ea2ddf65b8 (diff) | |
Resource handling needs refactoring.
Phase Two:
Fix all C++based demos/examples/tutorials.
Call cleanupResources() for all textures created.
Task-number: QTBUG-24043
Change-Id: I4bef23f7fe56e092de79bb91b41d6d691329b2cf
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Reviewed-by: Danny Pope <daniel.pope@nokia.com>
Diffstat (limited to 'examples/qt3d/builder/builder.cpp')
| -rw-r--r-- | examples/qt3d/builder/builder.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/examples/qt3d/builder/builder.cpp b/examples/qt3d/builder/builder.cpp index 07078b8d0..2e1db9842 100644 --- a/examples/qt3d/builder/builder.cpp +++ b/examples/qt3d/builder/builder.cpp @@ -53,6 +53,7 @@ BuilderView::BuilderView(QWindow *parent) : QGLView(parent) , canScene(new QGLSceneNode(this)) + , texture(0) { //! [0] QGLSceneNode *can = buildGeometry(); @@ -97,6 +98,7 @@ BuilderView::BuilderView(QWindow *parent) BuilderView::~BuilderView() { + texture->cleanupResources(); delete canScene; } @@ -132,6 +134,7 @@ QGLSceneNode *BuilderView::buildGeometry() url.setPath(QLatin1String(":/images/qt-soup.png")); url.setScheme(QLatin1String("file")); mat->setTextureUrl(url); + texture = mat->texture(); int canMat = root->palette()->addMaterial(mat); root->setMaterialIndex(canMat); root->setEffect(QGL::LitMaterial); |