projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Call SetCurrentFocusActor()
[platform/core/uifw/dali-toolkit.git]
/
dali-scene-loader
/
public-api
/
mesh-definition.cpp
diff --git
a/dali-scene-loader/public-api/mesh-definition.cpp
b/dali-scene-loader/public-api/mesh-definition.cpp
index
69292e2
..
de37e30
100644
(file)
--- a/
dali-scene-loader/public-api/mesh-definition.cpp
+++ b/
dali-scene-loader/public-api/mesh-definition.cpp
@@
-466,9
+466,14
@@
void MeshDefinition::Blob::ApplyMinMax(const std::vector<float>& min, const std:
: (max.empty() ? [](const float* min, const float* max, uint32_t i, float& value) {
value = std::max(min[i], value);
}
: (max.empty() ? [](const float* min, const float* max, uint32_t i, float& value) {
value = std::max(min[i], value);
}
- : [](const float* min, const float* max, uint32_t i, float& value) {
+ :
static_cast<ClampFn>(
[](const float* min, const float* max, uint32_t i, float& value) {
value = std::min(std::max(min[i], value), max[i]);
value = std::min(std::max(min[i], value), max[i]);
- });
+ }));
+
+ if(!clampFn)
+ {
+ return;
+ }
auto end = values + count * numComponents;
while(values != end)
auto end = values + count * numComponents;
while(values != end)