diff options
| author | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:09:44 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2017-05-24 12:10:02 +0100 |
| commit | 77d294db076dac19e8b549b445ffede9f7260c84 (patch) | |
| tree | 828ee7a6862ec5c0bd24f97cb540625a2c647376 /examples/qt3d/compute-particles/ComputeFrameGraph.qml | |
| parent | 59f8fec8a41606b3185fe3a4e276978e3e1ed5ef (diff) | |
| parent | 939b9b4b7591e8a421cf048a0a84ed3e75d81d21 (diff) | |
Merge branch 'dev' into wip/animationwip/animation
Change-Id: I6e770609c90a7745d08fa4e2f424e865678c5d6f
Diffstat (limited to 'examples/qt3d/compute-particles/ComputeFrameGraph.qml')
| -rw-r--r-- | examples/qt3d/compute-particles/ComputeFrameGraph.qml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/examples/qt3d/compute-particles/ComputeFrameGraph.qml b/examples/qt3d/compute-particles/ComputeFrameGraph.qml index 902d8ef74..1a07f7544 100644 --- a/examples/qt3d/compute-particles/ComputeFrameGraph.qml +++ b/examples/qt3d/compute-particles/ComputeFrameGraph.qml @@ -49,7 +49,7 @@ ****************************************************************************/ import Qt3D.Core 2.0 -import Qt3D.Render 2.0 +import Qt3D.Render 2.9 Viewport { property alias camera: selector.camera @@ -77,7 +77,7 @@ Viewport { CameraSelector { id: selector TechniqueFilter { - MemoryBarrier { barrierTypes: MemoryBarrier.VertexAttributeArrayBarrier } + MemoryBarrier { waitFor: MemoryBarrier.VertexAttributeArray } matchAll: [ FilterKey { name: "type"; value: "draw"} ] |