3 files changed, 22 insertions, 7 deletions
diff --git a/scene/3d/skeleton.cpp b/scene/3d/skeleton.cpp
index d0b739e17f..c996a8123c 100644
--- a/scene/3d/skeleton.cpp
+++ b/scene/3d/skeleton.cpp
@@ -64,15 +64,17 @@ bool Skeleton::_set(const StringName& p_path, const Variant& p_value) {
 	else if (what=="bound_childs") {
 		Array children=p_value;
 
-		bones[which].nodes_bound.clear();
+		if (is_inside_tree()) {
+			bones[which].nodes_bound.clear();
 
-		for (int i=0;i<children.size();i++) {
+			for (int i=0;i<children.size();i++) {
 
-			NodePath path=children[i];
-			ERR_CONTINUE( path.operator String()=="" );
-			Node *node = get_node(path);
-			ERR_CONTINUE(!node);
-			bind_child_node_to_bone(which,node);
+				NodePath path=children[i];
+				ERR_CONTINUE( path.operator String()=="" );
+				Node *node = get_node(path);
+				ERR_CONTINUE(!node);
+				bind_child_node_to_bone(which,node);
+			}
 		}
 	} else {
 		return false;
diff --git a/scene/3d/sprite_3d.cpp b/scene/3d/sprite_3d.cpp
index 8c86c4bf35..74cab30b17 100644
--- a/scene/3d/sprite_3d.cpp
+++ b/scene/3d/sprite_3d.cpp
@@ -585,6 +585,17 @@ Rect2 Sprite3D::get_item_rect() const {
 	return Rect2(ofs,s);
 }
 
+
+void Sprite3D::_validate_property(PropertyInfo& property) const {
+
+	if (property.name=="frame") {
+
+		property.hint=PROPERTY_HINT_SPRITE_FRAME;
+
+		property.hint_string="0,"+itos(vframes*hframes-1)+",1";
+	}
+}
+
 void Sprite3D::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("set_texture","texture:Texture"),&Sprite3D::set_texture);
diff --git a/scene/3d/sprite_3d.h b/scene/3d/sprite_3d.h
index 41e6ba804a..31f8ec020f 100644
--- a/scene/3d/sprite_3d.h
+++ b/scene/3d/sprite_3d.h
@@ -158,6 +158,8 @@ class Sprite3D : public SpriteBase3D {
 protected:
 	virtual void _draw();
 	static void _bind_methods();
+
+	virtual void _validate_property(PropertyInfo& property) const;
 public: