Merge branch 'master' into features/effectnode
This commit is contained in:
commit
880ae2abdf
|
@ -76,7 +76,9 @@ namespace
|
||||||
|
|
||||||
#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
|
#if QT_VERSION < QT_VERSION_CHECK( 6, 0, 0 )
|
||||||
QOpenGLFramebufferObject* m_fbo;
|
QOpenGLFramebufferObject* m_fbo;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if QT_VERSION < QT_VERSION_CHECK( 6, 4, 0 )
|
||||||
struct RenderTarget
|
struct RenderTarget
|
||||||
{
|
{
|
||||||
QRhiRenderTarget* rt = nullptr;
|
QRhiRenderTarget* rt = nullptr;
|
||||||
|
|
Loading…
Reference in New Issue