소스 검색

Replace 'or'/'and' keywords

Some compilers do not like this.
George Marques 9 년 전
부모
커밋
5cb31f6d5b
2개의 변경된 파일2개의 추가작업 그리고 2개의 파일을 삭제
  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 {
 		
-		if (next_pos<0 or next_pos>len) {
+		if (next_pos<0 || next_pos>len) {
 			if (!backwards)
 				next_pos=0;
 			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;
 	// prepare for all cases of interpolation
 
-	if (loop and loop_interpolation) {
+	if (loop && loop_interpolation) {
 	// loop
 		if (idx>=0) {