Merge remote-tracking branch 'upstream/development' into camera_and_editor_viewport_widget_improvements

Signed-off-by: Yuriy Toporovskyy <toporovskyy.y@gmail.com>

Code/Editor/Objects/DisplayContextShared.inl

@@ -74,12 +74,12 @@ void DisplayContext::DrawTri(const Vec3& p1, const Vec3& p2, const Vec3& p3)
 
 void DisplayContext::DrawTriangles(const AZStd::vector<Vec3>& vertices, const ColorB& color)
 {
-    pRenderAuxGeom->DrawTriangles(vertices.begin(), vertices.size(), color);
+    pRenderAuxGeom->DrawTriangles(vertices.begin(), static_cast<uint32>(vertices.size()), color);
 }
 
 void DisplayContext::DrawTrianglesIndexed(const AZStd::vector<Vec3>& vertices, const AZStd::vector<vtx_idx>& indices, const ColorB& color)
 {
-    pRenderAuxGeom->DrawTriangles(vertices.begin(), vertices.size(), indices.begin(), indices.size(), color);
+    pRenderAuxGeom->DrawTriangles(vertices.begin(), static_cast<uint32>(vertices.size()), indices.begin(), static_cast<uint32_t>(indices.size()), color);
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -862,7 +862,7 @@ void DisplayContext::DrawLine(const Vec3& p1, const Vec3& p2, const QColor& rgb1
 //////////////////////////////////////////////////////////////////////////
 void DisplayContext::DrawLines(const AZStd::vector<Vec3>& points, const ColorF& color)
 {
-    pRenderAuxGeom->DrawLines(points.begin(), points.size(), color, m_thickness);
+    pRenderAuxGeom->DrawLines(points.begin(), static_cast<uint32>(points.size()), color, m_thickness);
 }
 
 //////////////////////////////////////////////////////////////////////////
@@ -1287,8 +1287,8 @@ void DisplayContext::Flush2D()
     uvs[3] = 0;
     uvt[3] = 0;
 
-    int nLabels = m_textureLabels.size();
-    for (int i = 0; i < nLabels; i++)
+    const size_t nLabels = m_textureLabels.size();
+    for (size_t i = 0; i < nLabels; i++)
     {
         STextureLabel& t = m_textureLabels[i];
         float w2 = t.w * 0.5f;

Code/Editor/Objects/EntityObject.h

@@ -163,7 +163,7 @@ public:
 
     //////////////////////////////////////////////////////////////////////////
     //! Return number of event targets of Script.
-    int     GetEventTargetCount() const { return m_eventTargets.size(); };
+    int     GetEventTargetCount() const { return static_cast<int>(m_eventTargets.size()); };
     CEntityEventTarget& GetEventTarget(int index) { return m_eventTargets[index]; };
     //! Add new event target, returns index of created event target.
     //! Event targets are Always entities.
@@ -176,7 +176,7 @@ public:
     // Entity Links.
     //////////////////////////////////////////////////////////////////////////
     //! Return number of event targets of Script.
-    int     GetEntityLinkCount() const { return m_links.size(); };
+    int     GetEntityLinkCount() const { return static_cast<int>(m_links.size()); };
     CEntityLink& GetEntityLink(int index) { return m_links[index]; };
     virtual int AddEntityLink(const QString& name, GUID targetEntityId);
     virtual bool EntityLinkExists(const QString& name, GUID targetEntityId);

Code/Editor/Objects/ObjectLoader.h

@@ -70,7 +70,7 @@ AZ_POP_DISABLE_DLL_EXPORT_BASECLASS_WARNING
     CBaseObject* LoadObject(const XmlNodeRef& objNode, CBaseObject* pPrevObject = NULL);
 
     //////////////////////////////////////////////////////////////////////////
-    int GetLoadedObjectsCount() { return m_loadedObjects.size(); }
+    int GetLoadedObjectsCount() { return static_cast<int>(m_loadedObjects.size()); }
     CBaseObject* GetLoadedObject(int nIndex) const { return m_loadedObjects[nIndex].pObject; }
 
     //! If true new loaded objects will be assigned new GUIDs.

Code/Editor/Objects/ObjectManager.h

@@ -58,7 +58,7 @@ public:
 class CBaseObjectsCache
 {
 public:
-    int GetObjectCount() const { return m_objects.size(); }
+    int GetObjectCount() const { return static_cast<int>(m_objects.size()); }
     CBaseObject* GetObject(int nIndex) const { return m_objects[nIndex]; }
     void AddObject(CBaseObject* object);
 

Code/Editor/Objects/SelectionGroup.h

@@ -71,7 +71,7 @@ public:
     //! And save resulting objects to saveTo selection.
     void    FilterParents();
     //! Get number of child filtered objects.
-    int GetFilteredCount() const { return m_filtered.size(); }
+    int GetFilteredCount() const { return static_cast<int>(m_filtered.size()); }
     CBaseObject* GetFilteredObject(int i) const { return m_filtered[i]; }
 
     //////////////////////////////////////////////////////////////////////////