1 files changed, 13 insertions, 2 deletions
diff --git a/scene/animation/animation_tree_player.h b/scene/animation/animation_tree_player.h
index 0fec9a9551..0e78281e4c 100644
--- a/scene/animation/animation_tree_player.h
+++ b/scene/animation/animation_tree_player.h
@@ -99,7 +99,7 @@ private:
 
 	struct Track {
 		uint32_t id;
-		Node *node;
+		Object *object;
 		Spatial* spatial;
 		Skeleton *skeleton;
 		int bone_idx;
@@ -109,6 +109,9 @@ private:
 		Quat rot;
 		Vector3 scale;
 
+		Variant value;
+
+		bool skip;
 	};
 
 
@@ -160,6 +163,9 @@ private:
 		float step;
 		String from;
 		bool skip;
+
+		HashMap<NodePath,bool> filter;
+
 		AnimationNode() { type=NODE_ANIMATION;  next=NULL; last_version=0; skip=false; }
 	};
 
@@ -246,6 +252,7 @@ private:
 		float xfade;
 
 		TransitionNode() { type=NODE_TRANSITION;  xfade=0; inputs.resize(1); input_data.resize(1); current=0; prev=-1; prev_time=0; prev_xfading=0; switched=false; }
+		void set_current(int p_current);
 	};
 
 
@@ -267,7 +274,7 @@ private:
 	Map<StringName,NodeBase*> node_map;
 
 	// return time left to finish animation
-	float _process_node(const StringName& p_node,AnimationNode **r_prev_anim, float p_weight,float p_step, bool switched, bool p_seek=false,const HashMap<NodePath,bool> *p_filter=NULL, float p_reverse_weight=0);
+	float _process_node(const StringName& p_node,AnimationNode **r_prev_anim, float p_weight,float p_step, bool p_seek=false,const HashMap<NodePath,bool> *p_filter=NULL, float p_reverse_weight=0);
 	void _process_animation(float p_delta);
 	bool reset_request;
 
@@ -307,6 +314,10 @@ public:
 	void animation_node_set_master_animation(const StringName& p_node,const String& p_master_animation);
 	String animation_node_get_master_animation(const StringName& p_node) const;
 
+	void animation_node_set_filter_path(const StringName& p_node,const NodePath& p_filter,bool p_enable);
+	void animation_node_set_get_filtered_paths(const StringName& p_node,List<NodePath> *r_paths) const;
+	bool animation_node_is_path_filtered(const StringName& p_node,const NodePath& p_path) const;
+
 	/* ONE SHOT NODE */
 
 	void oneshot_node_set_fadein_time(const StringName& p_node,float p_time);