diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2018-03-05 12:54:56 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2018-03-07 09:01:22 +0000 |
| commit | 25bec131b2650023f9dcc662ca2a455a42bc8dea (patch) | |
| tree | 813096afc700c4a10bde789b38d6e808a6f0f85b /tools | |
| parent | 564767c13da33ba00f29a0c9e5e08241f6b07ac0 (diff) | |
Change setMesh signature
...to take the name only so the 'static' and 'dynamic' setter APIs are
in sync and do not interfere with each other. Test this in the autotest
as well. There is no way to manually create a mesh (MeshList) at the moment
anyways.
This involves changing the setter implementation to prevent returning
early before we get a chance to do some custom actions.
Change-Id: Iafc499c12033203dbd9a1a5f82f3ae2a61585b6c
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qt3dsexplorer/manualpresentationtest.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/qt3dsexplorer/manualpresentationtest.cpp b/tools/qt3dsexplorer/manualpresentationtest.cpp index 0fc26be..22f6116 100644 --- a/tools/qt3dsexplorer/manualpresentationtest.cpp +++ b/tools/qt3dsexplorer/manualpresentationtest.cpp @@ -69,7 +69,7 @@ QVector<Q3DSUipPresentation *> ManualPresentationTest::build() Q3DSModelNode *model1 = mainPres->newObject<Q3DSModelNode>("model1"); // A model needs a mesh. Meshes are retrieved via // Q3DSUipPresentation::mesh() which loads or returns a cached one. - model1->setMesh(mainPres->mesh(QLatin1String("#Cube"))); // let's use a built-in primitive + model1->setMesh(QLatin1String("#Cube"), *mainPres); // let's use a built-in primitive layer1->appendChildNode(model1); Q3DSDefaultMaterial *mat1 = mainPres->newObject<Q3DSDefaultMaterial>("mat1"); |