[3.0] Fix svace issue 99/55199/1 accepted/tizen/mobile/20151222.224218 accepted/tizen/tv/20151222.224232 accepted/tizen/wearable/20151222.224247 submit/tizen/20151222.112230 submit/tizen_common/20151229.142028 submit/tizen_common/20151229.144031 submit/tizen_common/20151229.154718
authortaeyoon <taeyoon0.lee@samsung.com>
Tue, 22 Dec 2015 10:50:10 +0000 (19:50 +0900)
committertaeyoon <taeyoon0.lee@samsung.com>
Tue, 22 Dec 2015 10:51:36 +0000 (19:51 +0900)
Change-Id: I2dc389090f094e85cd0eb6285756434dcdb90617

dali/devel-api/rendering/material.cpp

index aeb7885..546e4b7 100644 (file)
@@ -99,13 +99,12 @@ void Material::RemoveTexture( size_t index )
 
 void Material::SetTextureImage( size_t index, Image image )
 {
-  Internal::Image* imagePtr(0);
   if( image )
   {
+    Internal::Image* imagePtr(0);
     imagePtr = &GetImplementation( image );
+    GetImplementation(*this).SetTextureImage( index, imagePtr );
   }
-
-  GetImplementation(*this).SetTextureImage( index, imagePtr );
 }
 
 void Material::SetTextureSampler( size_t index, Sampler sampler )