From 9418d3133d041f9cd9cd1bd82dbcff2ad1ade268 Mon Sep 17 00:00:00 2001 From: tscholb Date: Mon, 1 Nov 2021 16:15:10 +0900 Subject: [PATCH] Revert "[Tizen] Protect dereferencing null in Node" This reverts commit fcb81cd980326b1cfc9f5672b1211b36785537f3. --- dali/internal/update/nodes/node.h | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-) diff --git a/dali/internal/update/nodes/node.h b/dali/internal/update/nodes/node.h index 3758b4d..75c08a0 100644 --- a/dali/internal/update/nodes/node.h +++ b/dali/internal/update/nodes/node.h @@ -360,12 +360,7 @@ public: */ const Vector3& GetParentOrigin() const { - if(mTransformManagerData.Id() != INVALID_TRANSFORM_ID && mParentOrigin.mTxManagerData) - { - return mParentOrigin.Get(0); - } - - return Vector3::ZERO; + return mParentOrigin.Get(0); } /** @@ -383,12 +378,7 @@ public: */ const Vector3& GetAnchorPoint() const { - if(mTransformManagerData.Id() != INVALID_TRANSFORM_ID && mAnchorPoint.mTxManagerData) - { - return mAnchorPoint.Get(0); - } - - return Vector3::ZERO; + return mAnchorPoint.Get(0); } /** @@ -407,7 +397,7 @@ public: */ const Vector3& GetPosition(BufferIndex bufferIndex) const { - if(mTransformManagerData.Id() != INVALID_TRANSFORM_ID && mPosition.mTxManagerData) + if(mTransformManagerData.Id() != INVALID_TRANSFORM_ID) { return mPosition.Get(bufferIndex); } @@ -443,7 +433,7 @@ public: */ const Quaternion& GetOrientation(BufferIndex bufferIndex) const { - if(mTransformManagerData.Id() != INVALID_TRANSFORM_ID && mOrientation.mTxManagerData) + if(mTransformManagerData.Id() != INVALID_TRANSFORM_ID) { return mOrientation.Get(0); } @@ -480,7 +470,7 @@ public: */ const Vector3& GetScale(BufferIndex bufferIndex) const { - if(mTransformManagerData.Id() != INVALID_TRANSFORM_ID && mScale.mTxManagerData) + if(mTransformManagerData.Id() != INVALID_TRANSFORM_ID) { return mScale.Get(0); } @@ -630,7 +620,7 @@ public: */ const Vector3& GetSize(BufferIndex bufferIndex) const { - if(mTransformManagerData.Id() != INVALID_TRANSFORM_ID && mSize.mTxManagerData) + if(mTransformManagerData.Id() != INVALID_TRANSFORM_ID) { DALI_LOG_RELEASE_INFO("id = %d, data = %p, manager = %p, id = %d, mSize data = %p, index = %x\n", mId, &mTransformManagerData, mTransformManagerData.mManager, mTransformManagerData.mId, mSize.mTxManagerData, mDepthIndex); -- 2.7.4