X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali%2Finternal%2Fevent%2Factors%2Factor-coords.cpp;h=4ee65663da29346aa024e2aed0a2bb7f44da4b9f;hb=74aca73794f55767b0fb9a94fc3653fae8ed3e62;hp=d1a70dba9fa723ea3f95b94ef3352a30224a596b;hpb=dfb16c0dbc52b529ac39869a667524605f5ea0bb;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/event/actors/actor-coords.cpp b/dali/internal/event/actors/actor-coords.cpp index d1a70db..4ee6566 100644 --- a/dali/internal/event/actors/actor-coords.cpp +++ b/dali/internal/event/actors/actor-coords.cpp @@ -502,12 +502,9 @@ Matrix CalculateActorWorldTransform(const Actor& actor) Matrix worldMatrix; Vector3 localPosition; - // descentList is leaf first, so traverse from root (end) to leaf (beginning) - const size_t descentCount = descentList.size(); - for(size_t iter = 0u; iter < descentCount; ++iter) + for(unsigned int i(descentList.size() - 1); i < descentList.size(); --i) { - auto i = descentCount - iter - 1u; Vector3 anchorPoint = descentList[i].GetProperty(Dali::Actor::Property::ANCHOR_POINT); Vector3 parentOrigin = descentList[i].GetProperty(Dali::Actor::Property::PARENT_ORIGIN); bool positionUsesAnchorPoint = descentList[i].GetProperty(Dali::Actor::Property::POSITION_USES_ANCHOR_POINT); @@ -592,11 +589,9 @@ Vector4 CalculateActorWorldColor(const Actor& actor) currentActor = currentActor.GetParent(); } while(inheritance != Dali::ColorMode::USE_OWN_COLOR && currentActor); - Vector4 worldColor; - const size_t descentCount = descentList.size(); - for(size_t iter = 0u; iter < descentCount; ++iter) + Vector4 worldColor; + for(unsigned int i(descentList.size() - 1); i < descentList.size(); --i) { - auto i = descentCount - iter - 1u; if(inheritanceModeList[i] == USE_OWN_COLOR || i == descentList.size() - 1) { worldColor = descentList[i].GetProperty(Dali::Actor::Property::COLOR);