[dali_1.9.32] Merge branch 'devel/master'

[platform/core/uifw/dali-core.git] / dali / internal / render / common / render-item.cpp

diff --git a/dali/internal/render/common/render-item.cpp b/dali/internal/render/common/render-item.cpp
old mode 100644 (file)
new mode 100755 (executable)
index d10e15e..d0daa83
--- a/dali/internal/render/common/render-item.cpp
+++ b/dali/internal/render/common/render-item.cpp
@@ -45,10 +45,11 @@ RenderItem* RenderItem::New()
 RenderItem::RenderItem()
 : mModelMatrix( false ),
   mModelViewMatrix( false ),
+  mColor( Vector4::ZERO ),
   mSize(),
-  mRenderer( NULL ),
-  mNode( NULL ),
-  mTextureSet( NULL ),
+  mRenderer( nullptr ),
+  mNode( nullptr ),
+  mTextureSet( nullptr ),
   mDepthIndex( 0 ),
   mIsOpaque( true ),
   mIsUpdated( false )
@@ -109,8 +110,8 @@ ClippingBox RenderItem::CalculateViewportSpaceAABB( const Vector3& size, const i
                         static_cast<float>( viewportWidth )  * 0.5f - aabb.x,
                         static_cast<float>( viewportHeight ) * 0.5f - aabb.y );
 
-  int x = static_cast< int >( roundf( aabbInScreen.x ) );
-  int y = static_cast< int >( roundf( aabbInScreen.y ) );
+  int x = static_cast< int >( floor( aabbInScreen.x ) );
+  int y = static_cast< int >( floor( aabbInScreen.y ) );
   int z = static_cast< int >( roundf( aabbInScreen.z ) );
   int w = static_cast< int >( roundf( aabbInScreen.w ) );