projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge "Add BuildPickingRay to devel api" into devel/master
[platform/core/uifw/dali-core.git]
/
dali
/
internal
/
update
/
manager
/
transform-manager-property.h
diff --git
a/dali/internal/update/manager/transform-manager-property.h
b/dali/internal/update/manager/transform-manager-property.h
index
b9600bd
..
fe5fec4
100644
(file)
--- a/
dali/internal/update/manager/transform-manager-property.h
+++ b/
dali/internal/update/manager/transform-manager-property.h
@@
-400,9
+400,7
@@
public:
}
else if(mProperty == TRANSFORM_PROPERTY_WORLD_SCALE)
{
- Vector3 position;
- Quaternion orientation;
- worldMatrix.GetTransformComponents(position, orientation, mValue);
+ mValue = worldMatrix.GetScale();
}
}
}