From: David Steele <david.steele@samsung.com>
Date: Tue, 25 May 2021 23:28:35 +0000 (+0100)
Subject: Merge branch 'devel/master' into devel/graphics
X-Git-Tag: dali_2.0.28~3^2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=7923c3d4f1d8ef3866e07eb43e5f6806cb108ef2

Merge branch 'devel/master' into devel/graphics

Change-Id: I51fef49392010ab166900229c74b05bb0520fcd3
---

7923c3d4f1d8ef3866e07eb43e5f6806cb108ef2
diff --cc automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-buffer.cpp
index fb06c3d,d8a1b1a..21eecf4
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-buffer.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-buffer.cpp
@@@ -87,8 -87,7 +87,8 @@@ void TestGraphicsBuffer::BindAsUniformB
    Graphics::UniformBlockInfo uboInfo{};
    reflection->GetUniformBlock(0, uboInfo);
  
-   auto offset = uboBinding.offset;
-   auto* data = memory.data() + offset;
 -  auto* data = memory.data();
++  auto  offset = uboBinding.offset;
++  auto* data   = memory.data() + offset;
  
    for(const auto& member : uboInfo.members)
    {