diff options
| author | George Marques <george@gmarqu.es> | 2016-06-19 12:36:50 -0300 |
|---|---|---|
| committer | George Marques <george@gmarqu.es> | 2016-06-19 12:36:50 -0300 |
| commit | 5cb31f6d5b667a551092b699de6f4786e0bb5b6d (patch) | |
| tree | 6365da78a507bd334e394d11a9bf3cd48dfdedef /scene | |
| parent | f47d7b27cb70c8f454fd5a6461f817a2928d52e5 (diff) | |
Replace 'or'/'and' keywords
Some compilers do not like this.
Diffstat (limited to 'scene')
| -rw-r--r-- | scene/animation/animation_player.cpp | 2 | ||||
| -rw-r--r-- | scene/resources/animation.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/scene/animation/animation_player.cpp b/scene/animation/animation_player.cpp index 0ff6931dcd..dd4fa992ac 100644 --- a/scene/animation/animation_player.cpp +++ b/scene/animation/animation_player.cpp @@ -572,7 +572,7 @@ void AnimationPlayer::_animation_process_data(PlaybackData &cd,float p_delta,flo } else { - if (next_pos<0 or next_pos>len) { + if (next_pos<0 || next_pos>len) { if (!backwards) next_pos=0; else if (backwards) diff --git a/scene/resources/animation.cpp b/scene/resources/animation.cpp index b6fc3eb419..8f61c7b957 100644 --- a/scene/resources/animation.cpp +++ b/scene/resources/animation.cpp @@ -1235,7 +1235,7 @@ T Animation::_interpolate( const Vector< TKey<T> >& p_keys, float p_time, Inter float c=0; // prepare for all cases of interpolation - if (loop and loop_interpolation) { + if (loop && loop_interpolation) { // loop if (idx>=0) { |