projects
/
platform
/
core
/
uifw
/
dali-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
16b7bbd
)
Revert "[3.0] Fix svace issue"
51/55851/2
author
taeyoon
<taeyoon0.lee@samsung.com>
Wed, 30 Dec 2015 02:00:06 +0000
(11:00 +0900)
committer
taeyoon
<taeyoon0.lee@samsung.com>
Fri, 15 Jan 2016 02:13:11 +0000
(11:13 +0900)
This reverts commit
80a2f0d38962f926342481c602f33e9025586125
.
Change-Id: Ibfcb08c1e5a011d79cbdf7891e890df1e5864394
dali/devel-api/rendering/material.cpp
patch
|
blob
|
history
diff --git
a/dali/devel-api/rendering/material.cpp
b/dali/devel-api/rendering/material.cpp
index
546e4b7
..
aeb7885
100644
(file)
--- a/
dali/devel-api/rendering/material.cpp
+++ b/
dali/devel-api/rendering/material.cpp
@@
-99,12
+99,13
@@
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 )