diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-06 18:05:00 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-06 18:05:07 +0100 |
| commit | 692ff260851575171be6751a7bdf34a744c2ed9d (patch) | |
| tree | 67c2ee80fb6a477f731ebc1898a5dfd43c878d2d /src/plugins/scenegraph/d3d12/qsgd3d12builtinmaterials.cpp | |
| parent | 8740f35e69dad301eeaa2fc4b74ecab661cdc0c4 (diff) | |
| parent | 5cb76fb3704947cfc4d575695b137460ecc8bbd9 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Change-Id: I1ed923d72566af663555898c3ec708191eef8ae9
Diffstat (limited to 'src/plugins/scenegraph/d3d12/qsgd3d12builtinmaterials.cpp')
| -rw-r--r-- | src/plugins/scenegraph/d3d12/qsgd3d12builtinmaterials.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/scenegraph/d3d12/qsgd3d12builtinmaterials.cpp b/src/plugins/scenegraph/d3d12/qsgd3d12builtinmaterials.cpp index 3351486bc6..312e8c19cd 100644 --- a/src/plugins/scenegraph/d3d12/qsgd3d12builtinmaterials.cpp +++ b/src/plugins/scenegraph/d3d12/qsgd3d12builtinmaterials.cpp @@ -460,8 +460,8 @@ QSGD3D12Material::UpdateResults QSGD3D12SmoothTextureMaterial::updatePipeline(co QSGD3D12TextMaterial::QSGD3D12TextMaterial(StyleType styleType, QSGD3D12RenderContext *rc, const QRawFont &font, QFontEngine::GlyphFormat glyphFormat) : m_styleType(styleType), - m_font(font), - m_rc(rc) + m_rc(rc), + m_font(font) { setFlag(Blending, true); |