diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 03:03:46 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-10-26 03:03:47 +0200 |
| commit | 048ca3b1c5227de50fc755270dc316767b465936 (patch) | |
| tree | 7d8136dcbbbf67350a1123f25b59e9ae551cfe84 /src | |
| parent | c48a542f685a2b73333ea340ea629d2827ccdc1d (diff) | |
| parent | 2e8842d1c7cea00a9798930f3d5aacc26293b726 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
Change-Id: I450f2c8e7c9887b22c5a5781f70889e6ac4e915c
Diffstat (limited to 'src')
| -rw-r--r-- | src/doc/src/qmlextramaterials.qdoc | 35 | ||||
| -rw-r--r-- | src/render/framegraph/qbuffercapture.cpp | 8 |
2 files changed, 43 insertions, 0 deletions
diff --git a/src/doc/src/qmlextramaterials.qdoc b/src/doc/src/qmlextramaterials.qdoc index e0a2e9edf..338bada09 100644 --- a/src/doc/src/qmlextramaterials.qdoc +++ b/src/doc/src/qmlextramaterials.qdoc @@ -544,6 +544,41 @@ The default value is 0.5. */ +/*! + \qmlproperty BlendEquationArguments::Blending PhongAlphaMaterial::sourceRgbArg + + Holds the blend equation source RGB blending argument. + + \sa Qt3DRender::QBlendEquationArguments::Blending +*/ +/*! + \qmlproperty BlendEquationArguments::Blending PhongAlphaMaterial::destinationRgbArg + + Holds the blend equation destination RGB blending argument. + + \sa Qt3DRender::QBlendEquationArguments::Blending +*/ +/*! + \qmlproperty BlendEquationArguments::Blending PhongAlphaMaterial::sourceAlphaArg + + Holds the blend equation source alpha blending argument. + + \sa Qt3DRender::QBlendEquationArguments::Blending +*/ +/*! + \qmlproperty BlendEquationArguments::Blending PhongAlphaMaterial::destinationAlphaArg + + Holds the blend equation destination alpha blending argument. + + \sa Qt3DRender::QBlendEquationArguments::Blending +*/ +/*! + \qmlproperty BlendEquation::BlendFunction PhongAlphaMaterial::blendFunctionArg + + Holds the blend equation function argument. + + \sa Qt3DRender::QBlendEquation::BlendFunction +*/ /*! \qmltype PhongMaterial diff --git a/src/render/framegraph/qbuffercapture.cpp b/src/render/framegraph/qbuffercapture.cpp index 0c12a3aff..c71c0adb7 100644 --- a/src/render/framegraph/qbuffercapture.cpp +++ b/src/render/framegraph/qbuffercapture.cpp @@ -62,6 +62,14 @@ QBufferCapturePrivate::QBufferCapturePrivate() \inmodule Qt3DRender \brief Exchanges buffer data between GPU and CPU. */ + +/*! + \qmltype BufferCapture + \inqmlmodule Qt3D.Render + \instantiates Qt3DRender::QBufferCapture + \brief Exchanges buffer data between GPU and CPU. +*/ + QBufferCapture::QBufferCapture(Qt3DCore::QNode *parent) : QFrameGraphNode(*new QBufferCapturePrivate, parent) { |