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
[dali_1.4.26] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
plugins
/
dali-script-v8
/
src
/
animation
/
constrainer-api.cpp
diff --git
a/plugins/dali-script-v8/src/animation/constrainer-api.cpp
b/plugins/dali-script-v8/src/animation/constrainer-api.cpp
index
8f55d27
..
d15097a
100644
(file)
--- a/
plugins/dali-script-v8/src/animation/constrainer-api.cpp
+++ b/
plugins/dali-script-v8/src/animation/constrainer-api.cpp
@@
-116,13
+116,8
@@
bool GetApplyParameters( const v8::FunctionCallbackInfo< v8::Value >& args, Acto
targetPropertyIndex = targetActor.GetPropertyIndex( propertyName );
if( targetPropertyIndex == Property::INVALID_INDEX )
{
targetPropertyIndex = targetActor.GetPropertyIndex( propertyName );
if( targetPropertyIndex == Property::INVALID_INDEX )
{
- targetPropertyIndex = targetActor.GetPropertyIndex( propertyName );
-
- if( targetPropertyIndex == Property::INVALID_INDEX )
- {
- DALI_SCRIPT_EXCEPTION( isolate, "Target property not found" );
- return false;
- }
+ DALI_SCRIPT_EXCEPTION( isolate, "Target property not found" );
+ return false;
}
}
else
}
}
else
@@
-139,14
+134,9
@@
bool GetApplyParameters( const v8::FunctionCallbackInfo< v8::Value >& args, Acto
sourcePropertyIndex = targetActor.GetPropertyIndex( propertyName );
if( sourcePropertyIndex == Property::INVALID_INDEX )
{
sourcePropertyIndex = targetActor.GetPropertyIndex( propertyName );
if( sourcePropertyIndex == Property::INVALID_INDEX )
{
- sourcePropertyIndex = targetActor.GetPropertyIndex( propertyName );
-
- if( sourcePropertyIndex == Property::INVALID_INDEX )
- {
- DALI_SCRIPT_EXCEPTION( isolate, "Source property not found" );
- return false;
+ DALI_SCRIPT_EXCEPTION( isolate, "Source property not found" );
+ return false;
}
}
- }
}
else
{
}
else
{