diff options
author | Mike Krus <mike.krus@kdab.com> | 2019-10-20 18:46:16 +0100 |
---|---|---|
committer | Mike Krus <mike.krus@kdab.com> | 2019-10-21 09:52:59 +0100 |
commit | 3281951ccc9b607ffaf41d8425b3e3cce3936fd1 (patch) | |
tree | 58abafd7b2092eb0559d497a63e1522385303d43 | |
parent | ce4663c2659d9e1611a1647a9b3cd26da8a80604 (diff) |
Fix Coverity warnings
Change-Id: I00c875b48d838170fddf0b92f0ac5592828c6f0f
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
36 files changed, 60 insertions, 25 deletions
diff --git a/src/animation/backend/abstractevaluateclipanimatorjob.cpp b/src/animation/backend/abstractevaluateclipanimatorjob.cpp index 236a96efe..5267d4526 100644 --- a/src/animation/backend/abstractevaluateclipanimatorjob.cpp +++ b/src/animation/backend/abstractevaluateclipanimatorjob.cpp @@ -53,13 +53,8 @@ public: void postFrame(Qt3DCore::QAspectManager *manager) override; - Q_DECLARE_PUBLIC(AbstractEvaluateClipAnimatorJob) - AnimationRecord m_record; QVector<AnimationCallbackAndValue> m_callbacks; - -private: - AbstractEvaluateClipAnimatorJob *q_ptr; }; AbstractEvaluateClipAnimatorJob::AbstractEvaluateClipAnimatorJob() diff --git a/src/animation/backend/animationclip.cpp b/src/animation/backend/animationclip.cpp index 2dea81b52..2c7e4fffb 100644 --- a/src/animation/backend/animationclip.cpp +++ b/src/animation/backend/animationclip.cpp @@ -68,6 +68,7 @@ AnimationClip::AnimationClip() , m_name() , m_channels() , m_duration(0.0f) + , m_channelComponentCount(0) { } @@ -81,6 +82,7 @@ void AnimationClip::cleanup() m_dataType = Unknown; m_channels.clear(); m_duration = 0.0f; + m_channelComponentCount = 0; clearData(); } diff --git a/src/animation/backend/buildblendtreesjob.cpp b/src/animation/backend/buildblendtreesjob.cpp index 3cfa81446..b4cc04323 100644 --- a/src/animation/backend/buildblendtreesjob.cpp +++ b/src/animation/backend/buildblendtreesjob.cpp @@ -50,8 +50,9 @@ namespace Animation { BuildBlendTreesJob::BuildBlendTreesJob() : Qt3DCore::QAspectJob() + , m_handler(nullptr) { - SET_JOB_RUN_STAT_TYPE(this, JobTypes::BuildBlendTree, 0); + SET_JOB_RUN_STAT_TYPE(this, JobTypes::BuildBlendTree, 0) } void BuildBlendTreesJob::setBlendedClipAnimators(const QVector<HBlendedClipAnimator> &blendedClipAnimatorHandles) diff --git a/src/animation/backend/channelmapping.cpp b/src/animation/backend/channelmapping.cpp index 83e7322da..42942fdd3 100644 --- a/src/animation/backend/channelmapping.cpp +++ b/src/animation/backend/channelmapping.cpp @@ -106,9 +106,9 @@ void ChannelMapping::syncFromFrontEnd(const Qt3DCore::QNode *frontEnd, bool firs const QCallbackMapping *callbackMapping = qobject_cast<const QCallbackMapping *>(frontEnd); if (callbackMapping) { m_mappingType = ChannelMappingType; - m_channelName = channelMapping->channelName(); + m_channelName = callbackMapping->channelName(); - const QCallbackMappingPrivate *d = static_cast<const QCallbackMappingPrivate *>(Qt3DCore::QNodePrivate::get(channelMapping)); + const QCallbackMappingPrivate *d = static_cast<const QCallbackMappingPrivate *>(Qt3DCore::QNodePrivate::get(callbackMapping)); m_type = d->m_type; m_callback = d->m_callback; m_callbackFlags = d->m_callbackFlags; diff --git a/src/animation/backend/evaluateblendclipanimatorjob.cpp b/src/animation/backend/evaluateblendclipanimatorjob.cpp index 9b6802d3b..765531902 100644 --- a/src/animation/backend/evaluateblendclipanimatorjob.cpp +++ b/src/animation/backend/evaluateblendclipanimatorjob.cpp @@ -54,6 +54,7 @@ namespace Animation { EvaluateBlendClipAnimatorJob::EvaluateBlendClipAnimatorJob() : AbstractEvaluateClipAnimatorJob() + , m_handler(nullptr) { SET_JOB_RUN_STAT_TYPE(this, JobTypes::EvaluateBlendClipAnimator, 0) } diff --git a/src/animation/backend/evaluateclipanimatorjob.cpp b/src/animation/backend/evaluateclipanimatorjob.cpp index 7a568e829..914a38139 100644 --- a/src/animation/backend/evaluateclipanimatorjob.cpp +++ b/src/animation/backend/evaluateclipanimatorjob.cpp @@ -52,6 +52,7 @@ namespace Animation { EvaluateClipAnimatorJob::EvaluateClipAnimatorJob() : AbstractEvaluateClipAnimatorJob() + , m_handler(nullptr) { SET_JOB_RUN_STAT_TYPE(this, JobTypes::EvaluateClipAnimator, 0) } diff --git a/src/animation/backend/findrunningclipanimatorsjob.cpp b/src/animation/backend/findrunningclipanimatorsjob.cpp index fde3f7db8..1005914c7 100644 --- a/src/animation/backend/findrunningclipanimatorsjob.cpp +++ b/src/animation/backend/findrunningclipanimatorsjob.cpp @@ -48,8 +48,9 @@ namespace Animation { FindRunningClipAnimatorsJob::FindRunningClipAnimatorsJob() : Qt3DCore::QAspectJob() + , m_handler(nullptr) { - SET_JOB_RUN_STAT_TYPE(this, JobTypes::FindRunningClipAnimator, 0); + SET_JOB_RUN_STAT_TYPE(this, JobTypes::FindRunningClipAnimator, 0) } void FindRunningClipAnimatorsJob::setDirtyClipAnimators(const QVector<HClipAnimator> &clipAnimatorHandles) diff --git a/src/animation/backend/loadanimationclipjob.cpp b/src/animation/backend/loadanimationclipjob.cpp index 977564c7f..93d4c2d9d 100644 --- a/src/animation/backend/loadanimationclipjob.cpp +++ b/src/animation/backend/loadanimationclipjob.cpp @@ -64,6 +64,7 @@ public: LoadAnimationClipJob::LoadAnimationClipJob() : Qt3DCore::QAspectJob(*new LoadAnimationClipJobPrivate) , m_animationClipHandles() + , m_handler(nullptr) { SET_JOB_RUN_STAT_TYPE(this, JobTypes::LoadAnimationClip, 0) } diff --git a/src/animation/frontend/qabstractchannelmapping.cpp b/src/animation/frontend/qabstractchannelmapping.cpp index 3249e6876..599ec6ed7 100644 --- a/src/animation/frontend/qabstractchannelmapping.cpp +++ b/src/animation/frontend/qabstractchannelmapping.cpp @@ -46,6 +46,7 @@ namespace Qt3DAnimation { QAbstractChannelMappingPrivate::QAbstractChannelMappingPrivate() : Qt3DCore::QNodePrivate() + , m_mappingType(QChannelMappingCreatedChangeBase::ChannelMapping) { } diff --git a/src/animation/frontend/qvertexblendanimation.cpp b/src/animation/frontend/qvertexblendanimation.cpp index 25468d4a7..143b9553a 100644 --- a/src/animation/frontend/qvertexblendanimation.cpp +++ b/src/animation/frontend/qvertexblendanimation.cpp @@ -192,8 +192,8 @@ void QVertexBlendAnimationPrivate::updateAnimation(float position) Qt3DRender::QGeometry *geometry = m_target->geometry(); // remove attributes from previous frame - if ((m_currentBase && (base != m_currentBase)) - || (m_currentTarget && (target != m_currentTarget))) { + if (m_currentBase && m_currentTarget && + (base != m_currentBase || target != m_currentTarget)) { const QVector<Qt3DRender::QAttribute *> baseAttributes = m_currentBase->attributeList(); const QVector<Qt3DRender::QAttribute *> targetAttributes = m_currentTarget->attributeList(); for (int i = 0; i < baseAttributes.size(); ++i) { diff --git a/src/core/aspects/qaspectmanager.cpp b/src/core/aspects/qaspectmanager.cpp index 71e05b34f..027264977 100644 --- a/src/core/aspects/qaspectmanager.cpp +++ b/src/core/aspects/qaspectmanager.cpp @@ -107,6 +107,7 @@ QAspectManager::QAspectManager(QObject *parent) , m_serviceLocator(new QServiceLocator()) , m_simulationLoopRunning(false) , m_driveMode(QAspectEngine::Automatic) + , m_postConstructorInit(nullptr) { qRegisterMetaType<QSurface *>("QSurface*"); qCDebug(Aspects) << Q_FUNC_INFO; diff --git a/src/core/aspects/qaspectmanager_p.h b/src/core/aspects/qaspectmanager_p.h index d9a6c41ec..ebc148324 100644 --- a/src/core/aspects/qaspectmanager_p.h +++ b/src/core/aspects/qaspectmanager_p.h @@ -122,7 +122,6 @@ private: QAbstractAspectJobManager *m_jobManager; QChangeArbiter *m_changeArbiter; QScopedPointer<QServiceLocator> m_serviceLocator; - bool m_mainLoopRunning; bool m_simulationLoopRunning; QAspectEngine::RunMode m_driveMode; QVector<NodeTreeChange> m_nodeTreeChanges; diff --git a/src/core/jobs/task.cpp b/src/core/jobs/task.cpp index 091aabfd6..7c3ebf6eb 100644 --- a/src/core/jobs/task.cpp +++ b/src/core/jobs/task.cpp @@ -57,6 +57,7 @@ RunnableInterface::~RunnableInterface() AspectTaskRunnable::AspectTaskRunnable() : m_pooler(nullptr) + , m_id(0) , m_reserved(false) { } diff --git a/src/core/resources/qframeallocator.cpp b/src/core/resources/qframeallocator.cpp index 61a82a2b4..e85ae4057 100644 --- a/src/core/resources/qframeallocator.cpp +++ b/src/core/resources/qframeallocator.cpp @@ -57,6 +57,8 @@ QT_BEGIN_NAMESPACE namespace Qt3DCore { QFrameAllocatorPrivate::QFrameAllocatorPrivate() + : m_maxObjectSize(0U) + , m_alignment(0U) { } diff --git a/src/core/transforms/qabstractskeleton.cpp b/src/core/transforms/qabstractskeleton.cpp index 5f3b05eb8..0cc1a28d2 100644 --- a/src/core/transforms/qabstractskeleton.cpp +++ b/src/core/transforms/qabstractskeleton.cpp @@ -47,6 +47,7 @@ namespace Qt3DCore { QAbstractSkeletonPrivate::QAbstractSkeletonPrivate() : Qt3DCore::QNodePrivate() + , m_type(QSkeletonCreatedChangeBase::Skeleton) , m_jointCount(0) { } diff --git a/src/core/transforms/sqt_p.h b/src/core/transforms/sqt_p.h index 5fdefccc8..e602cc71e 100644 --- a/src/core/transforms/sqt_p.h +++ b/src/core/transforms/sqt_p.h @@ -71,7 +71,9 @@ struct Sqt Sqt() : rotation() , scale(1.0f, 1.0f, 1.0f) + , pad1(0.f) , translation() + , pad2(0.f) {} inline QMatrix4x4 toMatrix() const diff --git a/src/input/backend/keyboardeventfilter.cpp b/src/input/backend/keyboardeventfilter.cpp index bd3bac5a7..e4f47f08e 100644 --- a/src/input/backend/keyboardeventfilter.cpp +++ b/src/input/backend/keyboardeventfilter.cpp @@ -53,6 +53,7 @@ namespace Input { KeyboardEventFilter::KeyboardEventFilter(QObject *parent) : QObject(parent) + , m_inputHandler(nullptr) { } diff --git a/src/input/backend/mouseeventfilter.cpp b/src/input/backend/mouseeventfilter.cpp index 618a64b15..48b30725a 100644 --- a/src/input/backend/mouseeventfilter.cpp +++ b/src/input/backend/mouseeventfilter.cpp @@ -53,6 +53,7 @@ namespace Input { MouseEventFilter::MouseEventFilter(QObject *parent) : QObject(parent) + , m_inputHandler(nullptr) { } diff --git a/src/logic/manager.cpp b/src/logic/manager.cpp index 3d096a342..db90e6ad9 100644 --- a/src/logic/manager.cpp +++ b/src/logic/manager.cpp @@ -56,6 +56,8 @@ namespace Logic { Manager::Manager() : m_logicHandlerManager(new HandlerManager) + , m_logicAspect(nullptr) + , m_executor(nullptr) , m_dt(0.0f) { } diff --git a/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp b/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp index ddb950f86..ab783102d 100644 --- a/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp +++ b/src/plugins/geometryloaders/gltf/gltfgeometryloader.cpp @@ -139,7 +139,8 @@ GLTFGeometryLoader::BufferData::BufferData(const QJsonObject &json) } GLTFGeometryLoader::AccessorData::AccessorData() - : type(QAttribute::Float) + : bufferViewIndex(0) + , type(QAttribute::Float) , dataSize(0) , count(0) , offset(0) diff --git a/src/quick3d/imports/scene3d/scene3ditem.cpp b/src/quick3d/imports/scene3d/scene3ditem.cpp index f3f7acd71..835485385 100644 --- a/src/quick3d/imports/scene3d/scene3ditem.cpp +++ b/src/quick3d/imports/scene3d/scene3ditem.cpp @@ -154,6 +154,7 @@ Scene3DItem::Scene3DItem(QQuickItem *parent) , m_disableClearWindow(false) , m_cameraAspectRatioMode(AutomaticAspectRatio) , m_compositingMode(FBO) + , m_dummySurface(nullptr) { setFlag(QQuickItem::ItemHasContents, true); setAcceptedMouseButtons(Qt::MouseButtonMask); diff --git a/src/quick3d/imports/scene3d/scene3drenderer.cpp b/src/quick3d/imports/scene3d/scene3drenderer.cpp index 1e375ccbb..7ef068c3e 100644 --- a/src/quick3d/imports/scene3d/scene3drenderer.cpp +++ b/src/quick3d/imports/scene3d/scene3drenderer.cpp @@ -162,6 +162,7 @@ Scene3DRenderer::Scene3DRenderer(Scene3DItem *item, Qt3DCore::QAspectEngine *asp , m_shouldRender(false) , m_dirtyViews(false) , m_allowRendering(0) + , m_compositingMode(Scene3DItem::FBO) { Q_CHECK_PTR(m_item); Q_CHECK_PTR(m_item->window()); diff --git a/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp b/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp index 55538ad1f..cfe39e8c7 100644 --- a/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp +++ b/src/quick3d/imports/scene3d/scene3dsgmaterialshader.cpp @@ -76,6 +76,7 @@ Scene3DSGMaterialShader::Scene3DSGMaterialShader() : QSGMaterialShader() , m_matrixId(-1) , m_opacityId(-1) + , m_visibleId(-1) { } diff --git a/src/quick3d/quick3dscene2d/items/scene2dsharedobject.cpp b/src/quick3d/quick3dscene2d/items/scene2dsharedobject.cpp index cb9973f0a..aed624501 100644 --- a/src/quick3d/quick3dscene2d/items/scene2dsharedobject.cpp +++ b/src/quick3d/quick3dscene2d/items/scene2dsharedobject.cpp @@ -59,6 +59,7 @@ Scene2DSharedObject::Scene2DSharedObject(Scene2DManager *manager) , m_quickWindow(nullptr) , m_renderManager(manager) , m_surface(nullptr) + , m_renderThread(nullptr) , m_renderObject(nullptr) , m_disallowed(false) , m_quit(false) diff --git a/src/render/geometry/skeleton.cpp b/src/render/geometry/skeleton.cpp index 839a1a056..0452c020b 100644 --- a/src/render/geometry/skeleton.cpp +++ b/src/render/geometry/skeleton.cpp @@ -60,6 +60,8 @@ namespace Render { Skeleton::Skeleton() : BackendNode(Qt3DCore::QBackendNode::ReadWrite) , m_status(Qt3DCore::QSkeletonLoader::NotReady) + , m_createJoints(false) + , m_dataType(Unknown) , m_skeletonManager(nullptr) , m_jointManager(nullptr) { diff --git a/src/render/jobs/abstractpickingjob.cpp b/src/render/jobs/abstractpickingjob.cpp index 35e658535..092ab7d3b 100644 --- a/src/render/jobs/abstractpickingjob.cpp +++ b/src/render/jobs/abstractpickingjob.cpp @@ -63,6 +63,7 @@ AbstractPickingJob::AbstractPickingJob() , m_node(nullptr) , m_frameGraphRoot(nullptr) , m_renderSettings(nullptr) + , m_oneEnabledAtLeast(false) { } @@ -72,6 +73,7 @@ AbstractPickingJob::AbstractPickingJob(Qt3DCore::QAspectJobPrivate &dd) , m_node(nullptr) , m_frameGraphRoot(nullptr) , m_renderSettings(nullptr) + , m_oneEnabledAtLeast(false) { } diff --git a/src/render/jobs/filterproximitydistancejob.cpp b/src/render/jobs/filterproximitydistancejob.cpp index a25e88508..80a9e4777 100644 --- a/src/render/jobs/filterproximitydistancejob.cpp +++ b/src/render/jobs/filterproximitydistancejob.cpp @@ -43,8 +43,10 @@ namespace Render { FilterProximityDistanceJob::FilterProximityDistanceJob() : m_manager(nullptr) + , m_targetEntity(nullptr) + , m_distanceThresholdSquared(0.) { - SET_JOB_RUN_STAT_TYPE(this, JobTypes::ProximityFiltering, 0); + SET_JOB_RUN_STAT_TYPE(this, JobTypes::ProximityFiltering, 0) } void FilterProximityDistanceJob::run() diff --git a/src/render/jobs/updatetreeenabledjob.cpp b/src/render/jobs/updatetreeenabledjob.cpp index e97fc6414..5c6f2b378 100644 --- a/src/render/jobs/updatetreeenabledjob.cpp +++ b/src/render/jobs/updatetreeenabledjob.cpp @@ -71,6 +71,7 @@ void updateTreeEnabled(NodeManagers *manager, Entity *node, bool parentEnabled) UpdateTreeEnabledJob::UpdateTreeEnabledJob() : Qt3DCore::QAspectJob() , m_node(nullptr) + , m_manager(nullptr) { SET_JOB_RUN_STAT_TYPE(this, JobTypes::UpdateTreeEnabled, 0); } diff --git a/src/render/materialsystem/shader.cpp b/src/render/materialsystem/shader.cpp index 58709b37e..017deabac 100644 --- a/src/render/materialsystem/shader.cpp +++ b/src/render/materialsystem/shader.cpp @@ -62,6 +62,7 @@ Shader::Shader() : BackendNode(ReadWrite) , m_isLoaded(false) , m_dna(0) + , m_oldDna(0) , m_graphicsContext(nullptr) , m_status(QShaderProgram::NotReady) , m_requiresFrontendSync(false) diff --git a/src/render/raycasting/qcollisionqueryresult.cpp b/src/render/raycasting/qcollisionqueryresult.cpp index 9d1e484b6..d2a443691 100644 --- a/src/render/raycasting/qcollisionqueryresult.cpp +++ b/src/render/raycasting/qcollisionqueryresult.cpp @@ -46,6 +46,7 @@ namespace RayCasting { QCollisionQueryResultPrivate::QCollisionQueryResultPrivate() : QSharedData() + , m_handle(0) { } diff --git a/src/render/raycasting/qcollisionqueryresult_p.h b/src/render/raycasting/qcollisionqueryresult_p.h index 67f6a34d0..d8e2056eb 100644 --- a/src/render/raycasting/qcollisionqueryresult_p.h +++ b/src/render/raycasting/qcollisionqueryresult_p.h @@ -86,8 +86,10 @@ public: Hit(Qt3DCore::QNodeId entity, const Vector3D &intersection, float distance, const Vector3D &uvw) : m_entityId(entity) + , m_type(Entity) , m_intersection(intersection) , m_distance(distance) + , m_primitiveIndex(0U) , m_uvw(uvw) { } diff --git a/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp b/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp index 4b4199820..4d42b6291 100644 --- a/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp +++ b/src/render/renderers/opengl/graphicshelpers/submissioncontext.cpp @@ -538,9 +538,9 @@ GLuint SubmissionContext::updateRenderTarget(Qt3DCore::QNodeId renderTargetNodeI // ### TODO QTBUG-64757 this check is insufficient since the // texture may have changed to another one with the same size. That // case is not handled atm. - needsResize |= (rTex != nullptr && rTex->size() != s); - if (isActiveRenderTarget) { - if (attachment.m_point == QRenderTargetOutput::Color0) + if (rTex) { + needsResize |= rTex->size() != s; + if (isActiveRenderTarget && attachment.m_point == QRenderTargetOutput::Color0) m_renderTargetFormat = rTex->properties().format; } } diff --git a/src/render/renderers/opengl/jobs/renderviewbuilderjob.cpp b/src/render/renderers/opengl/jobs/renderviewbuilderjob.cpp index fa6218d6f..42f00d9f2 100644 --- a/src/render/renderers/opengl/jobs/renderviewbuilderjob.cpp +++ b/src/render/renderers/opengl/jobs/renderviewbuilderjob.cpp @@ -53,10 +53,12 @@ int renderViewInstanceCounter = 0; } // anonymous RenderViewBuilderJob::RenderViewBuilderJob() - : Qt3DCore::QAspectJob(), - m_renderView(nullptr) + : Qt3DCore::QAspectJob() + , m_renderView(nullptr) + , m_renderer(nullptr) + , m_index(0) { - SET_JOB_RUN_STAT_TYPE(this, JobTypes::RenderViewBuilder, renderViewInstanceCounter++); + SET_JOB_RUN_STAT_TYPE(this, JobTypes::RenderViewBuilder, renderViewInstanceCounter++) } void RenderViewBuilderJob::run() diff --git a/src/render/renderers/opengl/renderer/rendercommand.cpp b/src/render/renderers/opengl/renderer/rendercommand.cpp index e60b17668..ee0bf0aec 100644 --- a/src/render/renderers/opengl/renderer/rendercommand.cpp +++ b/src/render/renderers/opengl/renderer/rendercommand.cpp @@ -48,6 +48,7 @@ RenderCommand::RenderCommand() : m_stateSet(nullptr) , m_depth(0.0f) , m_changeCost(0) + , m_shaderDna(0) , m_type(RenderCommand::Draw) , m_primitiveCount(0) , m_primitiveType(QGeometryRenderer::Triangles) diff --git a/src/render/renderers/opengl/renderer/renderview.cpp b/src/render/renderers/opengl/renderer/renderview.cpp index aa9f4d1a5..48f622c07 100644 --- a/src/render/renderers/opengl/renderer/renderview.cpp +++ b/src/render/renderers/opengl/renderer/renderview.cpp @@ -238,11 +238,14 @@ RenderView::RenderView() : m_isDownloadBuffersEnable(false) , m_hasBlitFramebufferInfo(false) , m_renderer(nullptr) + , m_manager(nullptr) , m_devicePixelRatio(1.) - , m_viewport(QRectF(0.0f, 0.0f, 1.0f, 1.0f)) + , m_viewport(QRectF(0., 0., 1., 1.)) , m_gamma(2.2f) , m_surface(nullptr) , m_clearBuffer(QClearBuffers::None) + , m_clearDepthValue(1.f) + , m_clearStencilValue(0) , m_stateSet(nullptr) , m_noDraw(false) , m_compute(false) diff --git a/src/render/texture/texture.cpp b/src/render/texture/texture.cpp index d120c2b39..5ebde56b0 100644 --- a/src/render/texture/texture.cpp +++ b/src/render/texture/texture.cpp @@ -163,11 +163,11 @@ void Texture::syncFromFrontEnd(const QNode *frontEnd, bool firstTime) m_textureImageIds = ids; addDirtyFlag(DirtyImageGenerators); } - } - if (dnode->m_sharedTextureId != m_sharedTextureId) { - m_sharedTextureId = dnode->m_sharedTextureId; - addDirtyFlag(DirtySharedTextureId); + if (dnode->m_sharedTextureId != m_sharedTextureId) { + m_sharedTextureId = dnode->m_sharedTextureId; + addDirtyFlag(DirtySharedTextureId); + } } } |