diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-08-19 15:53:30 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-08-19 16:28:52 +0100 |
| commit | 8f863343a9e2e2f3630f22407f4e5e30e72745cf (patch) | |
| tree | 5574e3c2215d74345e15df5f45ed3211e065541a /src/render/geometry/qmesh.cpp | |
| parent | 3edb85002b848033bbeefa33001d19fb514ef489 (diff) | |
| parent | 9d8c9ada161ad97634992c444196add0abb4f9d1 (diff) | |
Merge branch '5.9' into dev
Conflicts:
src/render/backend/renderer.cpp
src/render/backend/renderview.cpp
src/render/graphicshelpers/graphicscontext_p.h
src/render/graphicshelpers/graphicshelperes2_p.h
src/render/graphicshelpers/graphicshelpergl2_p.h
src/render/graphicshelpers/graphicshelpergl3_2_p.h
src/render/graphicshelpers/graphicshelpergl3_3_p.h
src/render/graphicshelpers/graphicshelpergl4_p.h
src/render/graphicshelpers/graphicshelperinterface_p.h
src/render/jobs/pickboundingvolumejob.cpp
tests/auto/animation/clipanimator/tst_clipanimator.cpp
tests/auto/auto.pro
tests/manual/manual.pro
Also disabled the QQmlMetaType codepaths following commit
49a11e882059ee1729f776722e085dd21d378c36 in qtdeclarative. The
QQmlMetaType codepaths will be re-enabled once a qt5.git
integration has succeeded.
Change-Id: Ia654d75425e6d406c472d19864383612208cad2b
Diffstat (limited to 'src/render/geometry/qmesh.cpp')
| -rw-r--r-- | src/render/geometry/qmesh.cpp | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/src/render/geometry/qmesh.cpp b/src/render/geometry/qmesh.cpp index 109a8a445..9a1f10bc5 100644 --- a/src/render/geometry/qmesh.cpp +++ b/src/render/geometry/qmesh.cpp @@ -101,8 +101,18 @@ void QMeshPrivate::updateFunctor() * * Loads mesh data from external files in a variety of formats. * - * In Qt3D 5.9, Mesh supports the following formats: Wavefront OBJ, Stanford Triangle Format PLY, STL (STereoLithography). - * QMesh will also support Autodesk FBX files if the SDK is installed and the fbx geometry loader plugin is built and found. + * In Qt3D 5.9, Mesh supports the following formats: + * + * \list + * \li Wavefront OBJ + * \li Stanford Triangle Format PLY + * \li STL (STereoLithography) + * \endlist + * + * QMesh will also support the following format if the SDK is installed and the fbx geometry loader plugin is built and found. + * \list + * \li Autodesk FBX + * \endlist */ /*! @@ -139,8 +149,18 @@ void QMeshPrivate::updateFunctor() * Loads mesh data from external files in a variety of formats. * Qt3DRender::QMesh loads data into a single mesh. * - * In Qt3D 5.9, QMesh supports the following formats: Wavefront OBJ, Stanford Triangle Format PLY, STL (STereoLithography). - * QMesh will also support Autodesk FBX files if the SDK is installed and the fbx geometry loader plugin is built and found. + * In Qt3D 5.9, QMesh supports the following formats: + * + * \list + * \li Wavefront OBJ + * \li Stanford Triangle Format PLY + * \li STL (STereoLithography) + * \endlist + * + * QMesh will also support the following format if the SDK is installed and the fbx geometry loader plugin is built and found: + * \list + * \li Autodesk FBX + * \endlist * * If you wish to load an entire scene made of several objects, you should rather use the Qt3DRender::QSceneLoader instead. * |