Minor changes.

Source/Urho3D/UI/UI.cpp

@@ -445,8 +445,12 @@ void UI::RenderUpdate()
     {
         RenderToTextureData& data = it->second_;
         if (data.rootElement_.Expired())
+        {
             it = renderToTexture_.Erase(it);
-        else if (data.rootElement_->IsEnabled())
+            continue;
+        }
+
+        if (data.rootElement_->IsEnabled())
         {
             data.batches_.Clear();
             data.vertexData_.Clear();
@@ -465,10 +469,8 @@ void UI::RenderUpdate()
                 batch.AddQuad(scissor.left_, scissor.top_, scissor.right_, scissor.bottom_, 0, 0);
                 data.batches_.Push(batch);
             }
-            ++it;
         }
-        else
-            ++it;
+        ++it;
     }
 }
 
@@ -503,9 +505,9 @@ void UI::Render(bool renderUICommand)
     // Render to UIComponent textures. This is skipped when called from the RENDERUI command
     if (!renderUICommand)
     {
-        for (auto it = renderToTexture_.Begin(); it != renderToTexture_.End(); it++)
+        for (auto& item : renderToTexture_)
         {
-            RenderToTextureData& data = it->second_;
+            RenderToTextureData& data = item.second_;
             if (data.rootElement_->IsEnabled())
             {
                 SetVertexData(data.vertexBuffer_, data.vertexData_);
@@ -548,9 +550,9 @@ void UI::DebugDraw(UIElement* element)
             element->GetDebugDrawBatches(debugDrawBatches_, debugVertexData_, scissor);
         else
         {
-            for (auto it = renderToTexture_.Begin(); it != renderToTexture_.End(); it++)
+            for (auto& item : renderToTexture_)
             {
-                RenderToTextureData& data = it->second_;
+                RenderToTextureData& data = item.second_;
                 if (!data.rootElement_.Expired() && data.rootElement_ == root && data.rootElement_->IsEnabled())
                 {
                     element->GetDebugDrawBatches(data.debugDrawBatches_, data.debugVertexData_, scissor);
@@ -770,9 +772,9 @@ UIElement* UI::GetElementAt(const IntVector2& position, bool enabledOnly, IntVec
     // Mouse was not hovering UI element. Check elements rendered on 3D objects.
     if (!result && renderToTexture_.Size())
     {
-        for (auto it = renderToTexture_.Begin(); it != renderToTexture_.End(); it++)
+        for (auto& item : renderToTexture_)
         {
-            RenderToTextureData& data = it->second_;
+            RenderToTextureData& data = item.second_;
             if (data.rootElement_.Expired() || !data.rootElement_->IsEnabled())
                 continue;
 

Source/Urho3D/UI/UIComponent.cpp

@@ -38,6 +38,7 @@
 #include "../UI/UIComponent.h"
 #include "../UI/UIEvents.h"
 
+#include "../DebugNew.h"
 
 namespace Urho3D
 {
@@ -46,7 +47,6 @@ static int const UICOMPONENT_DEFAULT_TEXTURE_SIZE = 512;
 static int const UICOMPONENT_MIN_TEXTURE_SIZE = 64;
 static int const UICOMPONENT_MAX_TEXTURE_SIZE = 4096;
 
-
 class UIElement3D : public UIElement
 {
     URHO3D_OBJECT(UIElement3D, UIElement);
@@ -196,21 +196,20 @@ Texture2D* UIComponent::GetTexture() const
 
 void UIComponent::OnNodeSet(Node* node)
 {
-    UIElement3D* rootElement = static_cast<UIElement3D*>(rootElement_.Get());
-    rootElement->SetNode(node);
+    rootElement_->SetNode(node);
     if (node)
     {
         Renderer* renderer = GetSubsystem<Renderer>();
         StaticModel* model = node->GetComponent<StaticModel>();
-        rootElement->SetViewport(renderer->GetViewportForScene(GetScene(), viewportIndex_));
+        rootElement_->SetViewport(renderer->GetViewportForScene(GetScene(), viewportIndex_));
         if (model == nullptr)
             model_ = model = node->CreateComponent<StaticModel>();
         model->SetMaterial(material_);
-        rootElement->SetRenderTexture(texture_);
+        rootElement_->SetRenderTexture(texture_);
     }
     else
     {
-        rootElement->SetRenderTexture(nullptr);
+        rootElement_->SetRenderTexture(nullptr);
         if (model_.NotNull())
         {
             model_->Remove();
@@ -245,7 +244,7 @@ void UIComponent::SetViewportIndex(unsigned int index)
     {
         Renderer* renderer = GetSubsystem<Renderer>();
         Viewport* viewport = renderer->GetViewportForScene(scene, index);
-        static_cast<UIElement3D*>(rootElement_.Get())->SetViewport(viewport);
+        rootElement_->SetViewport(viewport);
     }
 }
 

Source/Urho3D/UI/UIComponent.h

@@ -34,6 +34,7 @@ class Viewport;
 class UIElement;
 class UIBatch;
 class VertexBuffer;
+class UIElement3D;
 
 class URHO3D_API UIComponent : public Component
 {
@@ -69,7 +70,7 @@ protected:
     /// Model created by this component. If node already has StaticModel then this will be null.
     SharedPtr<StaticModel> model_;
     /// UIElement to be rendered into texture. It also handles screen to UI coordinate translation.
-    SharedPtr<UIElement> rootElement_;
+    SharedPtr<UIElement3D> rootElement_;
     /// Viewport index to be set when component is added to a node.
     unsigned viewportIndex_;
 };