Browse Source

Merge pull request #35966 from muiroc/anim_node_blend_ignored_bug

Use the blend parameter passed to blend_animation
Rémi Verschelde 4 years ago
parent
commit
1d1310f3d7
1 changed files with 2 additions and 1 deletions
  1. 2 1
      scene/animation/animation_tree.cpp

+ 2 - 1
scene/animation/animation_tree.cpp

@@ -820,6 +820,7 @@ void AnimationTree::_process_graph(float p_delta) {
 			Ref<Animation> a = as.animation;
 			float time = as.time;
 			float delta = as.delta;
+			float weight = as.blend;
 			bool seeked = as.seeked;
 
 			for (int i = 0; i < a->get_track_count(); i++) {
@@ -839,7 +840,7 @@ void AnimationTree::_process_graph(float p_delta) {
 
 				ERR_CONTINUE(blend_idx < 0 || blend_idx >= state.track_count);
 
-				float blend = (*as.track_blends)[blend_idx];
+				float blend = (*as.track_blends)[blend_idx] * weight;
 
 				if (blend < CMP_EPSILON) {
 					continue; //nothing to blend