[dali_2.3.18] Merge branch 'devel/master'

Change-Id: Iae2f5e81b7a1a2b5ee43c43bd342d08aa15d735c

diff --git a/dali-scene3d/internal/controls/scene-view/scene-view-impl.cpp b/dali-scene3d/internal/controls/scene-view/scene-view-impl.cpp
index 38e5611..8c9b9b3 100644 (file)
--- a/dali-scene3d/internal/controls/scene-view/scene-view-impl.cpp
+++ b/dali-scene3d/internal/controls/scene-view/scene-view-impl.cpp
@@ -904,6 +904,11 @@ bool SceneView::IsEnabledCropToMask()
   return mCropToMask;
 }
 
+Dali::RenderTask SceneView::GetRenderTask()
+{
+  return mRenderTask;
+}
+
 void SceneView::SetProperty(BaseObject* object, Property::Index index, const Property::Value& value)
 {
   Scene3D::SceneView sceneView = Scene3D::SceneView::DownCast(Dali::BaseHandle(object));

diff --git a/dali-scene3d/internal/controls/scene-view/scene-view-impl.h b/dali-scene3d/internal/controls/scene-view/scene-view-impl.h
index 1ddfd27..3d8c639 100644 (file)
--- a/dali-scene3d/internal/controls/scene-view/scene-view-impl.h
+++ b/dali-scene3d/internal/controls/scene-view/scene-view-impl.h
@@ -288,6 +288,11 @@ public:
    */
   bool IsEnabledCropToMask();
 
+  /**
+   * @brief Gets current RenderTask
+   */
+  Dali::RenderTask GetRenderTask();
+
   // Properties
 
   /**

diff --git a/dali-scene3d/internal/event/collider-mesh-processor-impl.cpp b/dali-scene3d/internal/event/collider-mesh-processor-impl.cpp
index c205433..2ec0fed 100644 (file)
--- a/dali-scene3d/internal/event/collider-mesh-processor-impl.cpp
+++ b/dali-scene3d/internal/event/collider-mesh-processor-impl.cpp
@@ -94,11 +94,9 @@ public:
       Vector3     direction;
       cameraActor.ScreenToLocal(x, y, result.x, result.y);
 
-      auto                  list      = Stage::GetCurrent().GetRenderTaskList();
-      [[maybe_unused]] auto taskCount = list.GetTaskCount();
-      renderTask                      = list.GetTask(list.GetTaskCount() - 1);
+      auto sceneViewRenderTask = GetImpl(sceneView).GetRenderTask();
 
-      if(HitTestAlgorithm::BuildPickingRay(renderTask, result, origin, direction))
+      if(sceneViewRenderTask && HitTestAlgorithm::BuildPickingRay(sceneViewRenderTask, result, origin, direction))
       {
         for(auto& mesh : meshData)
         {

diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp
index 9af21f6..67b5ab0 100644 (file)
--- a/dali-toolkit/public-api/controls/control-impl.cpp
+++ b/dali-toolkit/public-api/controls/control-impl.cpp
@@ -308,12 +308,6 @@ bool Control::IsKeyboardFocusGroup()
   return Toolkit::KeyboardFocusManager::Get().IsFocusGroup(Self());
 }
 
-void Control::AccessibilityActivate()
-{
-  // Inform deriving classes
-  OnAccessibilityActivated();
-}
-
 void Control::KeyboardEnter()
 {
   // Inform deriving classes

diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h
index 9c156d4..9e2915e 100644 (file)
--- a/dali-toolkit/public-api/controls/control-impl.h
+++ b/dali-toolkit/public-api/controls/control-impl.h
@@ -264,12 +264,6 @@ public:
 
   /// @cond internal
   /**
-   * @brief Called by the AccessibilityManager to activate the Control.
-   * @SINCE_1_0.0
-   */
-  DALI_INTERNAL void AccessibilityActivate();
-
-  /**
    * @brief Called by the KeyboardFocusManager.
    * @SINCE_1_0.0
    */

diff --git a/dali-toolkit/public-api/dali-toolkit-version.cpp b/dali-toolkit/public-api/dali-toolkit-version.cpp
index 3e961d9..81dc48e 100644 (file)
--- a/dali-toolkit/public-api/dali-toolkit-version.cpp
+++ b/dali-toolkit/public-api/dali-toolkit-version.cpp
@@ -29,7 +29,7 @@ namespace Toolkit
 {
 const unsigned int TOOLKIT_MAJOR_VERSION = 2;
 const unsigned int TOOLKIT_MINOR_VERSION = 3;
-const unsigned int TOOLKIT_MICRO_VERSION = 17;
+const unsigned int TOOLKIT_MICRO_VERSION = 18;
 const char* const  TOOLKIT_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index 1f81a97..6c83b22 100644 (file)
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -1,6 +1,6 @@
 Name:       dali2-toolkit
 Summary:    Dali 3D engine Toolkit
-Version:    2.3.17
+Version:    2.3.18
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT