asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace 'or'/'and' keywords

Browse source 
Some compilers do not like this.
This commit is contained in:
George Marques 2016-06-19 12:36:50 -03:00
parent f47d7b27cb
commit 5cb31f6d5b
No known key found for this signature in database
GPG key ID: 046BD46A3201E43D
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
scene/animation/animation_player.cpp
View file

@ -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)

2
scene/resources/animation.cpp
View file

@ -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) {