Merge branch 'master' of https://github.com/okamstudio/godot

# Solved Conflicts:
#	tools/editor/property_editor.cpp
#	tools/editor/property_editor.h

1 files changed, 36 insertions, 0 deletions

diff --git a/tools/editor/array_property_edit.h b/tools/editor/array_property_edit.h
new file mode 100644
index 0000000000..acfb8e68ed
--- /dev/null
+++ b/tools/editor/array_property_edit.h
@@ -0,0 +1,36 @@
+#ifndef ARRAY_PROPERTY_EDIT_H
+#define ARRAY_PROPERTY_EDIT_H
+
+#include "scene/main/node.h"
+
+class ArrayPropertyEdit : public Reference {
+
+	OBJ_TYPE(ArrayPropertyEdit,Reference);
+
+	int page;
+	ObjectID obj;
+	StringName property;
+	String vtypes;
+	Variant get_array() const;
+	Variant::Type default_type;
+
+	void _notif_change();
+	void _notif_changev(const String& p_v);
+	void _set_size(int p_size);
+	void _set_value(int p_idx,const Variant& p_value);
+
+protected:
+
+	static void _bind_methods();
+	bool _set(const StringName& p_name, const Variant& p_value);
+	bool _get(const StringName& p_name,Variant &r_ret) const;
+	void _get_property_list( List<PropertyInfo> *p_list) const;
+
+public:
+
+	void edit(Object* p_obj, const StringName& p_prop, Variant::Type p_deftype);
+
+	ArrayPropertyEdit();
+};
+
+#endif // ARRAY_PROPERTY_EDIT_H