Explorar o código

Replace 'or'/'and' keywords

Some compilers do not like this.
George Marques %!s(int64=9) %!d(string=hai) anos
pai
achega
5cb31f6d5b
Modificáronse 2 ficheiros con 2 adicións e 2 borrados
  1. 1 1
      scene/animation/animation_player.cpp
  2. 1 1
      scene/resources/animation.cpp

+ 1 - 1
scene/animation/animation_player.cpp

@@ -572,7 +572,7 @@ void AnimationPlayer::_animation_process_data(PlaybackData &cd,float p_delta,flo
 
 
 	} else {
 	} else {
 		
 		
-		if (next_pos<0 or next_pos>len) {
+		if (next_pos<0 || next_pos>len) {
 			if (!backwards)
 			if (!backwards)
 				next_pos=0;
 				next_pos=0;
 			else if (backwards)
 			else if (backwards)

+ 1 - 1
scene/resources/animation.cpp

@@ -1235,7 +1235,7 @@ T Animation::_interpolate( const Vector< TKey<T> >& p_keys, float p_time,  Inter
 	float c=0;
 	float c=0;
 	// prepare for all cases of interpolation
 	// prepare for all cases of interpolation
 
 
-	if (loop and loop_interpolation) {
+	if (loop && loop_interpolation) {
 	// loop
 	// loop
 		if (idx>=0) {
 		if (idx>=0) {