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

106 files changed, 11717 insertions, 5960 deletions

diff --git a/tools/editor/animation_editor.cpp b/tools/editor/animation_editor.cpp
index d431af6c8d..5df49bd327 100644
--- a/tools/editor/animation_editor.cpp
+++ b/tools/editor/animation_editor.cpp
@@ -33,6 +33,7 @@
 #include "io/resource_saver.h"
 #include "pair.h"
 #include "scene/gui/separator.h"
+#include "editor_node.h"
 /* Missing to fix:
 
   *Set
@@ -634,9 +635,14 @@ void AnimationKeyEditor::_menu_track(int p_type) {
 	last_menu_track_opt=p_type;
 	switch(p_type) {
 
-		case TRACK_MENU_ADD_VALUE_TRACK:
-		case TRACK_MENU_ADD_TRANSFORM_TRACK:
 		case TRACK_MENU_ADD_CALL_TRACK: {
+			if (root) {
+				call_select->popup_centered_ratio();
+				break;
+			}
+		} break;
+		case TRACK_MENU_ADD_VALUE_TRACK:
+		case TRACK_MENU_ADD_TRANSFORM_TRACK: {
 
 			undo_redo->create_action("Anim Add Track");
 			undo_redo->add_do_method(animation.ptr(),"add_track",p_type);			
@@ -2363,7 +2369,7 @@ void AnimationKeyEditor::_track_editor_input_event(const InputEvent& p_input) {
 			te->update();
 			track_editor->set_tooltip("");
 
-			if (!track_editor->has_focus() && (!get_focus_owner() || !get_focus_owner()->cast_to<LineEdit>()))
+            if (!track_editor->has_focus() && (!get_focus_owner() || !get_focus_owner()->is_text_field()))
 				track_editor->call_deferred("grab_focus");
 
 
@@ -2735,6 +2741,7 @@ void AnimationKeyEditor::_notification(int p_what) {
 
 
 				}
+				call_select->connect("selected",this,"_add_call_track");
 //				rename_anim->set_icon( get_icon("Rename","EditorIcons") );
 /*
 				edit_anim->set_icon( get_icon("Edit","EditorIcons") );
@@ -3456,6 +3463,26 @@ void AnimationKeyEditor::_scale() {
 }
 
 
+void AnimationKeyEditor::_add_call_track(const NodePath& p_base) {
+
+	print_line("BASE IS "+String(p_base));
+	Node* base = EditorNode::get_singleton()->get_edited_scene();
+	if (!base)
+		return;
+	Node* from=base->get_node(p_base);
+	if (!from || !root)
+		return;
+
+	NodePath path = root->get_path_to(from);
+
+	undo_redo->create_action("Anim Add Call Track");
+	undo_redo->add_do_method(animation.ptr(),"add_track",Animation::TYPE_METHOD);
+	undo_redo->add_do_method(animation.ptr(),"track_set_path",animation->get_track_count(),path);
+	undo_redo->add_undo_method(animation.ptr(),"remove_track",animation->get_track_count());
+	undo_redo->commit_action();
+
+}
+
 void AnimationKeyEditor::cleanup() {
 
 	set_animation(Ref<Animation>());
@@ -3503,6 +3530,7 @@ void AnimationKeyEditor::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("_animation_optimize"),&AnimationKeyEditor::_animation_optimize);
 	ObjectTypeDB::bind_method(_MD("_curve_transition_changed"),&AnimationKeyEditor::_curve_transition_changed);
 	ObjectTypeDB::bind_method(_MD("_toggle_edit_curves"),&AnimationKeyEditor::_toggle_edit_curves);
+	ObjectTypeDB::bind_method(_MD("_add_call_track"),&AnimationKeyEditor::_add_call_track);
 
 
 	ADD_SIGNAL( MethodInfo("resource_selected", PropertyInfo( Variant::OBJECT, "res"),PropertyInfo( Variant::STRING, "prop") ) );
@@ -3815,7 +3843,9 @@ AnimationKeyEditor::AnimationKeyEditor(UndoRedo *p_undo_redo, EditorHistory *p_h
 	scale_dialog->connect("confirmed",this,"_scale");
 	add_child(scale_dialog);
 
-
+	call_select = memnew( SceneTreeDialog );
+	add_child(call_select);
+	call_select->set_title("Call Functions in Which Node?");
 
 }
 
diff --git a/tools/editor/animation_editor.h b/tools/editor/animation_editor.h
index 35053fb6a3..4a1cc21154 100644
--- a/tools/editor/animation_editor.h
+++ b/tools/editor/animation_editor.h
@@ -44,7 +44,7 @@
 #include "scene_tree_editor.h"
 #include "editor_data.h"
 #include "property_editor.h"
-
+#include "scene_tree_editor.h"
 
 class AnimationKeyEdit;
 class AnimationCurveEdit;
@@ -206,6 +206,8 @@ class AnimationKeyEditor : public VBoxContainer  {
 
 	PropertyEditor *key_editor;	
 
+	SceneTreeDialog *call_select;
+
 	Ref<Animation> animation;
 	void _update_paths();
 
@@ -299,6 +301,8 @@ class AnimationKeyEditor : public VBoxContainer  {
 	void _toggle_edit_curves();
 	void _animation_len_update();
 
+	void _add_call_track(const NodePath& p_base);
+
 	void _root_removed();
 protected:
 
diff --git a/tools/editor/array_property_edit.cpp b/tools/editor/array_property_edit.cpp
new file mode 100644
index 0000000000..9cd443270b
--- /dev/null
+++ b/tools/editor/array_property_edit.cpp
@@ -0,0 +1,231 @@
+#include "array_property_edit.h"
+
+#include "editor_node.h"
+
+#define ITEMS_PER_PAGE 100
+
+Variant ArrayPropertyEdit::get_array() const{
+
+	Object*o = ObjectDB::get_instance(obj);
+	if (!o)
+		return Array();
+	Variant arr=o->get(property);
+	if (!arr.is_array()) {
+		Variant::CallError ce;
+		arr=Variant::construct(default_type,NULL,0,ce);
+	}
+	return arr;
+}
+
+void ArrayPropertyEdit::_notif_change() {
+	_change_notify();
+}
+void ArrayPropertyEdit::_notif_changev(const String& p_v) {
+
+	_change_notify(p_v.utf8().get_data());
+}
+
+void ArrayPropertyEdit::_set_size(int p_size) {
+
+	Variant arr = get_array();
+	arr.call("resize",p_size);
+	Object*o = ObjectDB::get_instance(obj);
+	if (!o)
+		return;
+
+	o->set(property,arr);
+
+}
+
+void ArrayPropertyEdit::_set_value(int p_idx,const Variant& p_value) {
+
+	Variant arr = get_array();
+	arr.set(p_idx,p_value);
+	Object*o = ObjectDB::get_instance(obj);
+	if (!o)
+		return;
+
+	o->set(property,arr);
+}
+
+bool ArrayPropertyEdit::_set(const StringName& p_name, const Variant& p_value){
+
+	String pn=p_name;
+
+	if (pn.begins_with("array/")) {
+
+		if (pn=="array/size") {
+
+			Variant arr = get_array();
+			int size = arr.call("size");
+
+			int newsize=p_value;
+			if (newsize==size)
+				return true;
+
+			UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+			ur->create_action("Resize Array");
+			ur->add_do_method(this,"_set_size",newsize);
+			ur->add_undo_method(this,"_set_size",size);
+			if (newsize<size) {
+				for(int i=newsize;i<size;i++) {
+					ur->add_undo_method(this,"_set_value",i,arr.get(i));
+
+				}
+			}
+			ur->add_do_method(this,"_notif_change");
+			ur->add_undo_method(this,"_notif_change");
+			ur->commit_action();
+			return true;
+		}
+		if (pn=="array/page") {
+			page=p_value;
+			_change_notify();
+			return true;
+		}
+	} else if (pn.begins_with("indices")) {
+
+		if (pn.find("_")!=-1) {
+			//type
+			int idx=pn.get_slicec('/',1).get_slicec('_',0).to_int();
+
+			int type = p_value;
+
+			Variant arr = get_array();
+
+			Variant value = arr.get(idx);
+			if (value.get_type()!=type && type>=0 && type<Variant::VARIANT_MAX) {
+				Variant::CallError ce;
+				Variant new_value=Variant::construct(Variant::Type(type),NULL,0,ce);
+				UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+
+				ur->create_action("Change Array Value Type");
+				ur->add_do_method(this,"_set_value",idx,new_value);
+				ur->add_undo_method(this,"_set_value",idx,value);
+				ur->add_do_method(this,"_notif_change");
+				ur->add_undo_method(this,"_notif_change");
+				ur->commit_action();
+
+			}
+			return true;
+
+		} else {
+			int idx=pn.get_slicec('/',1).to_int();
+			Variant arr = get_array();
+
+			Variant value = arr.get(idx);
+			UndoRedo *ur = EditorNode::get_singleton()->get_undo_redo();
+
+			ur->create_action("Change Array Value");
+			ur->add_do_method(this,"_set_value",idx,p_value);
+			ur->add_undo_method(this,"_set_value",idx,value);
+			ur->add_do_method(this,"_notif_changev",p_name);
+			ur->add_undo_method(this,"_notif_changev",p_name);
+			ur->commit_action();
+			return true;
+		}
+	}
+
+	return false;
+}
+
+bool ArrayPropertyEdit::_get(const StringName& p_name,Variant &r_ret) const {
+
+	Variant arr = get_array();
+	//int size = arr.call("size");
+
+	String pn=p_name;
+	if (pn.begins_with("array/")) {
+
+		if (pn=="array/size") {
+			r_ret=arr.call("size");
+			return true;
+		}
+		if (pn=="array/page") {
+			r_ret=page;
+			return true;
+		}
+	} else if (pn.begins_with("indices")) {
+
+		if (pn.find("_")!=-1) {
+			//type
+			int idx=pn.get_slicec('/',1).get_slicec('_',0).to_int();
+			bool valid;
+			r_ret=arr.get(idx,&valid);
+			if (valid)
+				r_ret=r_ret.get_type();
+			return valid;
+
+		} else {
+			int idx=pn.get_slicec('/',1).to_int();
+			bool valid;
+			r_ret=arr.get(idx,&valid);
+			return valid;
+		}
+	}
+
+	return false;
+}
+
+void ArrayPropertyEdit::_get_property_list( List<PropertyInfo> *p_list) const{
+
+	Variant arr = get_array();
+	int size = arr.call("size");
+
+	p_list->push_back( PropertyInfo(Variant::INT,"array/size",PROPERTY_HINT_RANGE,"0,100000,1") );
+	int pages = size/ITEMS_PER_PAGE;
+	if (pages>0)
+		p_list->push_back( PropertyInfo(Variant::INT,"array/page",PROPERTY_HINT_RANGE,"0,"+itos(pages)+",1") );
+
+	int offset=page*ITEMS_PER_PAGE;
+
+	int items=MIN(size-offset,ITEMS_PER_PAGE);
+
+
+	for(int i=0;i<items;i++) {
+
+		Variant v=arr.get(i+offset);
+		if (arr.get_type()==Variant::ARRAY) {
+			p_list->push_back(PropertyInfo(Variant::INT,"indices/"+itos(i+offset)+"_type",PROPERTY_HINT_ENUM,vtypes));
+		}
+		if (arr.get_type()!=Variant::ARRAY || v.get_type()!=Variant::NIL) {
+			PropertyInfo pi(v.get_type(),"indices/"+itos(i+offset));
+			if (v.get_type()==Variant::OBJECT) {
+				pi.hint=PROPERTY_HINT_RESOURCE_TYPE;
+				pi.hint_string="Resource";
+			}
+			p_list->push_back(pi);
+		}
+	}
+
+}
+
+void ArrayPropertyEdit::edit(Object* p_obj,const StringName& p_prop,Variant::Type p_deftype) {
+
+	page=0;
+	property=p_prop;
+	obj=p_obj->get_instance_ID();
+	default_type=p_deftype;
+
+}
+
+void ArrayPropertyEdit::_bind_methods() {
+
+	ObjectTypeDB::bind_method(_MD("_set_size"),&ArrayPropertyEdit::_set_size);
+	ObjectTypeDB::bind_method(_MD("_set_value"),&ArrayPropertyEdit::_set_value);
+	ObjectTypeDB::bind_method(_MD("_notif_change"),&ArrayPropertyEdit::_notif_change);
+	ObjectTypeDB::bind_method(_MD("_notif_changev"),&ArrayPropertyEdit::_notif_changev);
+}
+
+ArrayPropertyEdit::ArrayPropertyEdit()
+{
+	page=0;
+	for(int i=0;i<Variant::VARIANT_MAX;i++) {
+
+		if (i>0)
+			vtypes+=",";
+		vtypes+=Variant::get_type_name( Variant::Type(i) );
+	}
+	default_type=Variant::NIL;
+
+}
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
diff --git a/tools/editor/dependency_editor.cpp b/tools/editor/dependency_editor.cpp
new file mode 100644
index 0000000000..c04e82a08a
--- /dev/null
+++ b/tools/editor/dependency_editor.cpp
@@ -0,0 +1,512 @@
+#include "dependency_editor.h"
+#include "os/file_access.h"
+#include "scene/gui/margin_container.h"
+#include "io/resource_loader.h"
+#include "editor_node.h"
+
+void DependencyEditor::_notification(int p_what){
+
+
+}
+
+void DependencyEditor::_searched(const String& p_path) {
+
+	Map<String,String> dep_rename;
+	dep_rename[replacing]=p_path;
+
+
+	ResourceLoader::rename_dependencies(editing,dep_rename);
+
+	_update_list();
+	_update_file();
+}
+
+void DependencyEditor::_load_pressed(Object* p_item,int p_cell,int p_button){
+
+	TreeItem *ti=p_item->cast_to<TreeItem>();
+	String fname = ti->get_text(0);
+	replacing = ti->get_text(1);
+
+	search->set_title("Search Replacement For: "+replacing.get_file());
+
+	search->clear_filters();
+	List<String> ext;
+	ResourceLoader::get_recognized_extensions_for_type(ti->get_metadata(0),&ext);
+	for (List<String>::Element *E=ext.front();E;E=E->next()) {
+		search->add_filter("*"+E->get());
+	}
+	search->popup_centered_ratio();
+
+}
+
+void DependencyEditor::_fix_and_find(EditorFileSystemDirectory *efsd, Map<String,Map<String,String> >& candidates){
+
+	for(int i=0;i<efsd->get_subdir_count();i++) {
+		_fix_and_find(efsd->get_subdir(i),candidates);
+	}
+
+	for(int i=0;i<efsd->get_file_count();i++) {
+
+		String file = efsd->get_file(i);
+		if (!candidates.has(file))
+			continue;
+
+		String path = efsd->get_file_path(i);
+		Map<String,String> &ss = candidates[file];
+
+
+		for(Map<String,String>::Element *E=candidates[file].front();E;E=E->next()) {
+
+			if (E->get()==String()) {
+				E->get()=path;
+				continue;
+			}
+
+			//must match the best, using subdirs
+			String existing=E->get().replace_first("res://","");
+			String current=path.replace_first("res://","");
+			String lost=E->key().replace_first("res://","");
+
+			Vector<String> existingv=existing.split("/");
+			existingv.invert();
+			Vector<String> currentv=current.split("/");
+			currentv.invert();
+			Vector<String> lostv=lost.split("/");
+			lostv.invert();
+
+			int existing_score=0;
+			int current_score=0;
+
+			for(int j=0;j<lostv.size();j++) {
+
+				if (j<existingv.size() && lostv[j]==existingv[j]) {
+					existing_score++;
+				}
+				if (j<currentv.size() && lostv[j]==currentv[j]) {
+					current_score++;
+				}
+			}
+
+			if (current_score > existing_score) {
+
+				//if it was the same, could track distance to new path but..
+
+				E->get()=path; //replace by more accurate
+			}
+
+		}
+
+	}
+
+}
+
+
+void DependencyEditor::_fix_all(){
+
+	if (!EditorFileSystem::get_singleton()->get_filesystem())
+		return;
+
+	Map<String,Map<String,String> > candidates;
+
+	for (List<String>::Element *E=missing.front();E;E=E->next()) {
+
+		String base = E->get().get_file();
+		if (!candidates.has(base)) {
+			candidates[base]=Map<String,String>();
+		}
+
+		candidates[base][E->get()]="";
+	}
+
+	_fix_and_find(EditorFileSystem::get_singleton()->get_filesystem(),candidates);
+
+	Map<String,String> remaps;
+
+	for (Map<String,Map<String,String> >::Element *E=candidates.front();E;E=E->next()) {
+
+		for (Map<String,String>::Element *F=E->get().front();F;F=F->next()) {
+
+			if (F->get()!=String()) {
+				remaps[F->key()]=F->get();
+			}
+		}
+
+	}
+
+	if (remaps.size()) {
+
+		ResourceLoader::rename_dependencies(editing,remaps);
+
+		_update_list();
+		_update_file();
+	}
+}
+
+void DependencyEditor::_update_file() {
+
+	EditorFileSystem::get_singleton()->update_file(editing);
+
+}
+
+void DependencyEditor::_update_list() {
+
+	List<String> deps;
+	ResourceLoader::get_dependencies(editing,&deps,true);
+
+	tree->clear();
+	missing.clear();
+
+	TreeItem *root = tree->create_item();
+
+	Ref<Texture> folder = get_icon("folder","FileDialog");
+
+	bool broken=false;
+
+	for(List<String>::Element *E=deps.front();E;E=E->next()) {
+
+		TreeItem *item = tree->create_item(root);
+
+		String n = E->get();
+		String path;
+		String type;
+
+		if (n.find("::")!=-1) {
+			path = n.get_slice("::",0);
+			type = n.get_slice("::",1);
+		} else {
+			path=n;
+			type="Resource";
+		}
+		String name = path.get_file();
+
+		Ref<Texture> icon;
+		if (has_icon(type,"EditorIcons")) {
+			icon=get_icon(type,"EditorIcons");
+		} else {
+			icon=get_icon("Object","EditorIcons");
+		}
+		item->set_text(0,name);
+		item->set_icon(0,icon);
+		item->set_metadata(0,type);
+		item->set_text(1,path);
+
+		if (!FileAccess::exists(path)) {
+			item->set_custom_color(1,Color(1,0.4,0.3));
+			missing.push_back(path);
+			broken=true;
+		}
+
+		item->add_button(1,folder,0);
+	}
+
+	fixdeps->set_disabled(!broken);
+
+}
+
+
+
+void DependencyEditor::edit(const String& p_path) {
+
+
+	editing=p_path;
+	set_title("Dependencies For: "+p_path.get_file());
+
+	_update_list();
+	popup_centered_ratio();
+
+	if (EditorNode::get_singleton()->is_scene_open(p_path)) {
+		EditorNode::get_singleton()->show_warning("Scene '"+p_path.get_file()+"' is currently being edited.\nChanges will not take effect unless reloaded.");
+	} else if (ResourceCache::has(p_path)) {
+		EditorNode::get_singleton()->show_warning("Resource '"+p_path.get_file()+"' is in use.\nChanges will take effect when reloaded.");
+	}
+}
+
+
+void DependencyEditor::_bind_methods() {
+
+	ObjectTypeDB::bind_method(_MD("_searched"),&DependencyEditor::_searched);
+	ObjectTypeDB::bind_method(_MD("_load_pressed"),&DependencyEditor::_load_pressed);
+	ObjectTypeDB::bind_method(_MD("_fix_all"),&DependencyEditor::_fix_all);
+
+}
+
+DependencyEditor::DependencyEditor() {
+
+	VBoxContainer *vb = memnew( VBoxContainer );
+	vb->set_name("Dependencies");
+	add_child(vb);
+	set_child_rect(vb);
+
+	tree = memnew( Tree );
+	tree->set_columns(2);
+	tree->set_column_titles_visible(true);
+	tree->set_column_title(0,"Resource");
+	tree->set_column_title(1,"Path");
+	tree->set_hide_root(true);
+	tree->connect("button_pressed",this,"_load_pressed");
+
+	HBoxContainer *hbc = memnew( HBoxContainer );
+	Label *label = memnew( Label("Dependencies:"));
+	hbc->add_child(label);
+	hbc->add_spacer();
+	fixdeps = memnew( Button("Fix Broken"));
+	hbc->add_child(fixdeps);
+	fixdeps->connect("pressed",this,"_fix_all");
+
+	vb->add_child(hbc);
+
+	MarginContainer *mc = memnew( MarginContainer );
+	mc->set_v_size_flags(SIZE_EXPAND_FILL);
+
+	mc->add_child(tree);
+	vb->add_child(mc);
+
+	set_title("Dependency Editor");
+	search = memnew( EditorFileDialog );
+	search->connect("file_selected",this,"_searched");
+	search->set_mode(EditorFileDialog::MODE_OPEN_FILE);
+	search->set_title("Search Replacement Resource:");
+	add_child(search);
+
+}
+
+/////////////////////////////////////
+
+
+
+void DependencyEditorOwners::_fill_owners(EditorFileSystemDirectory *efsd) {
+
+	if (!efsd)
+		return;
+
+	for(int i=0;i<efsd->get_subdir_count();i++) {
+		_fill_owners(efsd->get_subdir(i));
+	}
+
+	for(int i=0;i<efsd->get_file_count();i++) {
+
+		Vector<String> deps = efsd->get_file_deps(i);
+		//print_line(":::"+efsd->get_file_path(i));
+		bool found=false;
+		for(int j=0;j<deps.size();j++) {
+			//print_line("\t"+deps[j]+" vs "+editing);
+			if (deps[j]==editing) {
+				//print_line("found");
+				found=true;
+				break;
+			}
+		}
+		if (!found)
+			continue;
+
+		Ref<Texture> icon;
+		String type=efsd->get_file_type(i);
+		if (!has_icon(type,"EditorIcons")) {
+			icon=get_icon("Object","EditorIcons");
+		} else {
+			icon=get_icon(type,"EditorIcons");
+		}
+
+		owners->add_item(efsd->get_file_path(i),icon);
+	}
+
+}
+
+void DependencyEditorOwners::show(const String& p_path) {
+
+	editing=p_path;
+	owners->clear();
+	_fill_owners(EditorFileSystem::get_singleton()->get_filesystem());
+	popup_centered_ratio();
+
+	set_title("Owners Of: "+p_path.get_file());
+
+}
+
+DependencyEditorOwners::DependencyEditorOwners() {
+
+
+	owners = memnew( ItemList );
+	add_child(owners);
+	set_child_rect(owners);
+
+
+}
+
+///////////////////////
+
+
+void DependencyRemoveDialog::_fill_owners(EditorFileSystemDirectory *efsd) {
+
+	if (!efsd)
+		return;
+
+	for(int i=0;i<efsd->get_subdir_count();i++) {
+		_fill_owners(efsd->get_subdir(i));
+	}
+
+	for(int i=0;i<efsd->get_file_count();i++) {
+
+		Vector<String> deps = efsd->get_file_deps(i);
+		//print_line(":::"+efsd->get_file_path(i));
+		Set<String> met;
+		for(int j=0;j<deps.size();j++) {
+			if (files.has(deps[j])) {
+				met.insert(deps[j]);
+			}
+		}
+		if (!met.size())
+			continue;
+
+		exist=true;
+
+		Ref<Texture> icon;
+		String type=efsd->get_file_type(i);
+		if (!has_icon(type,"EditorIcons")) {
+			icon=get_icon("Object","EditorIcons");
+		} else {
+			icon=get_icon(type,"EditorIcons");
+		}
+
+
+		for(Set<String>::Element *E=met.front();E;E=E->next()) {
+
+			String which = E->get();
+			if (!files[which]) {
+				TreeItem *ti=owners->create_item(owners->get_root());
+				ti->set_text(0,which.get_file());
+				files[which]=ti;
+
+			}
+			TreeItem *ti=owners->create_item(files[which]);
+			ti->set_text(0,efsd->get_file_path(i));
+			ti->set_icon(0,icon);
+		}
+
+	}
+
+}
+
+void DependencyRemoveDialog::show(const Vector<String> &to_erase) {
+
+	exist=false;
+	owners->clear();
+	files.clear();
+	TreeItem *root=owners->create_item();
+	for(int i=0;i<to_erase.size();i++) {
+		files[to_erase[i]]=NULL;
+	}
+
+	_fill_owners(EditorFileSystem::get_singleton()->get_filesystem());
+
+	if (exist) {
+		owners->show();
+		text->set_text("The files being removed are required by other resources in order for them to work.\nRemove them anyway? (no undo)");
+		popup_centered_minsize(Size2(500,220));
+	} else {
+		owners->hide();
+		text->set_text("Remove selected files from the project? (no undo)");
+		popup_centered_minsize(Size2(400,100));
+	}
+
+}
+
+void DependencyRemoveDialog::ok_pressed() {
+
+
+	DirAccess *da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
+	for (Map<String,TreeItem*>::Element *E=files.front();E;E=E->next()) {
+
+		da->remove(E->key());
+		EditorFileSystem::get_singleton()->update_file(E->key());
+	}
+	memdelete(da);
+
+}
+
+DependencyRemoveDialog::DependencyRemoveDialog() {
+
+	VBoxContainer *vb = memnew( VBoxContainer );
+	add_child(vb);
+	set_child_rect(vb);
+
+	text = memnew( Label );
+	vb->add_child(text);
+
+	owners = memnew( Tree );
+	owners->set_hide_root(true);
+	vb->add_child(owners);
+	owners->set_v_size_flags(SIZE_EXPAND_FILL);
+	get_ok()->set_text("Remove");
+}
+
+
+//////////////
+
+
+void DependencyErrorDialog::show(const String& p_for_file,const Vector<String> &report) {
+
+
+	for_file=p_for_file;
+	set_title("Error loading: "+p_for_file.get_file());
+	files->clear();
+
+	TreeItem *root = files->create_item(NULL);
+	for(int i=0;i<report.size();i++) {
+
+		String dep;
+		String type="Object";
+		dep=report[i].get_slice("::",0);
+		if (report[i].get_slice_count("::")>0)
+			type=report[i].get_slice("::",1);
+
+		Ref<Texture> icon;
+		if (!has_icon(type,"EditorIcons")) {
+			icon=get_icon("Object","EditorIcons");
+		} else {
+			icon=get_icon(type,"EditorIcons");
+		}
+
+		TreeItem *ti=files->create_item(root);
+		ti->set_text(0,dep);
+		ti->set_icon(0,icon);
+
+	}
+
+	popup_centered_minsize(Size2(500,220));
+
+}
+
+void DependencyErrorDialog::ok_pressed() {
+
+	EditorNode::get_singleton()->load_scene(for_file,true);
+}
+
+void DependencyErrorDialog::custom_action(const String&) {
+
+	EditorNode::get_singleton()->fix_dependencies(for_file);
+}
+
+DependencyErrorDialog::DependencyErrorDialog() {
+
+	VBoxContainer *vb = memnew( VBoxContainer );
+	add_child(vb);
+	set_child_rect(vb);
+
+
+	files = memnew( Tree );
+	files->set_hide_root(true);
+	vb->add_margin_child("Scene failed to load due to missing dependencies:",files,true);
+	files->set_v_size_flags(SIZE_EXPAND_FILL);
+	get_ok()->set_text("Open Anyway");
+
+	text = memnew( Label );
+	vb->add_child(text);
+	text->set_text("Which action should be taken?");
+
+
+	fdep=add_button("Fix Dependencies",true,"fixdeps");
+
+	set_title("Errors loading!");
+
+}
diff --git a/tools/editor/dependency_editor.h b/tools/editor/dependency_editor.h
new file mode 100644
index 0000000000..1c328e7a93
--- /dev/null
+++ b/tools/editor/dependency_editor.h
@@ -0,0 +1,94 @@
+#ifndef DEPENDENCY_EDITOR_H
+#define DEPENDENCY_EDITOR_H
+
+#include "scene/gui/dialogs.h"
+#include "scene/gui/tree.h"
+#include "scene/gui/tab_container.h"
+#include "editor_file_dialog.h"
+
+class EditorFileSystemDirectory;
+
+class DependencyEditor : public AcceptDialog {
+	OBJ_TYPE(DependencyEditor,AcceptDialog);
+
+
+	Tree *tree;
+	Button *fixdeps;
+
+	EditorFileDialog *search;
+
+	String replacing;
+	String editing;
+	List<String> missing;
+
+
+	void _fix_and_find(EditorFileSystemDirectory *efsd, Map<String,Map<String,String> >& candidates);
+
+	void _searched(const String& p_path);
+	void _load_pressed(Object* p_item,int p_cell,int p_button);
+	void _fix_all();
+	void _update_list();
+
+	void _update_file();
+
+protected:
+
+	static void _bind_methods();
+	void _notification(int p_what);
+public:
+
+
+	void edit(const String& p_path);
+	DependencyEditor();
+};
+
+class DependencyEditorOwners : public AcceptDialog {
+	OBJ_TYPE(DependencyEditorOwners,AcceptDialog);
+
+	ItemList *owners;
+	String editing;
+	void _fill_owners(EditorFileSystemDirectory *efsd);
+
+public:
+
+	void show(const String& p_path);
+	DependencyEditorOwners();
+};
+
+class DependencyRemoveDialog : public ConfirmationDialog {
+	OBJ_TYPE(DependencyRemoveDialog,ConfirmationDialog);
+
+
+	Label *text;
+	Tree *owners;
+	bool exist;
+	Map<String,TreeItem*> files;
+	void _fill_owners(EditorFileSystemDirectory *efsd);
+
+	void ok_pressed();
+
+public:
+
+	void show(const Vector<String> &to_erase);
+	DependencyRemoveDialog();
+};
+
+
+class DependencyErrorDialog : public ConfirmationDialog {
+	OBJ_TYPE(DependencyErrorDialog,ConfirmationDialog);
+
+
+	String for_file;
+	Button *fdep;
+	Label *text;
+	Tree *files;
+	void ok_pressed();
+	void custom_action(const String&);
+
+public:
+
+	void show(const String& p_for,const Vector<String> &report);
+	DependencyErrorDialog();
+};
+
+#endif // DEPENDENCY_EDITOR_H
diff --git a/tools/editor/editor_data.cpp b/tools/editor/editor_data.cpp
index f729a6c869..673ee30adb 100644
--- a/tools/editor/editor_data.cpp
+++ b/tools/editor/editor_data.cpp
@@ -39,7 +39,7 @@ void EditorHistory::_cleanup_history() {
 		bool fail=false;
 
 		for(int j=0;j<history[i].path.size();j++) {
-			if (!history[i].path[j].res.is_null())
+			if (!history[i].path[j].ref.is_null())
 				continue;
 
 			if (ObjectDB::get_instance(history[i].path[j].object))
@@ -70,10 +70,10 @@ void EditorHistory::_add_object(ObjectID p_object,const String& p_property,int p
 
 	Object *obj = ObjectDB::get_instance(p_object);
 	ERR_FAIL_COND(!obj);
-	Resource *r = obj->cast_to<Resource>();
+	Reference *r = obj->cast_to<Reference>();
 	Obj o;
 	if (r)
-		o.res=RES(r);
+		o.ref=REF(r);
 	o.object=p_object;
 	o.property=p_property;
 
@@ -123,6 +123,27 @@ void EditorHistory::add_object(ObjectID p_object,int p_relevel){
 	_add_object(p_object,"",p_relevel);
 }
 
+int EditorHistory::get_history_len() {
+	return history.size();
+}
+int EditorHistory::get_history_pos() {
+	return current;
+}
+
+ObjectID EditorHistory::get_history_obj(int p_obj) const {
+	ERR_FAIL_INDEX_V(p_obj,history.size(),0);
+	ERR_FAIL_INDEX_V(history[p_obj].level,history[p_obj].path.size(),0);
+	return history[p_obj].path[history[p_obj].level].object;
+}
+
+bool EditorHistory::is_at_begining() const {
+	return current<=0;
+}
+bool EditorHistory::is_at_end() const {
+
+	return ((current+1)>=history.size());
+}
+
 
 bool EditorHistory::next() {
 
@@ -432,6 +453,7 @@ int EditorData::add_edited_scene(int p_at_pos) {
 	es.root=NULL;
 	es.history_current=-1;
 	es.version=0;
+	es.live_edit_root=NodePath(String("/root"));
 
 	if (p_at_pos==edited_scene.size())
 		edited_scene.push_back(es);
@@ -522,7 +544,7 @@ Ref<Script> EditorData::get_scene_root_script(int p_idx) const {
 	if (!edited_scene[p_idx].root)
 		return Ref<Script>();
 	Ref<Script> s=edited_scene[p_idx].root->get_script();
-	if (!s.is_valid()) {
+	if (!s.is_valid() && edited_scene[p_idx].root->get_child_count()) {
 		Node *n = edited_scene[p_idx].root->get_child(0);
 		while(!s.is_valid() && n && n->get_filename()==String()) {
 			s=n->get_script();
@@ -552,6 +574,23 @@ String EditorData::get_scene_path(int p_idx) const {
 
 }
 
+void EditorData::set_edited_scene_live_edit_root(const NodePath& p_root) {
+	ERR_FAIL_INDEX(current_edited_scene,edited_scene.size());
+
+	edited_scene[current_edited_scene].live_edit_root=p_root;
+
+}
+NodePath EditorData::get_edited_scene_live_edit_root() {
+
+	ERR_FAIL_INDEX_V(current_edited_scene,edited_scene.size(),String());
+
+	return edited_scene[current_edited_scene].live_edit_root;
+
+
+
+}
+
+
 void EditorData::save_edited_scene_state(EditorSelection *p_selection, EditorHistory *p_history, const Dictionary& p_custom) {
 
 	ERR_FAIL_INDEX(current_edited_scene,edited_scene.size());
diff --git a/tools/editor/editor_data.h b/tools/editor/editor_data.h
index 14a50da082..c5ee83ae63 100644
--- a/tools/editor/editor_data.h
+++ b/tools/editor/editor_data.h
@@ -45,7 +45,7 @@ class EditorHistory {
 
 	struct Obj {
 
-		RES res;
+		REF ref;
 		ObjectID object;
 		String property;
 	};
@@ -75,10 +75,17 @@ friend class EditorData;
 
 public:
 
+	bool is_at_begining() const;
+	bool is_at_end() const;
+
 	void add_object(ObjectID p_object);
 	void add_object(ObjectID p_object,const String& p_subprop);
 	void add_object(ObjectID p_object,int p_relevel);
 
+	int get_history_len();
+	int get_history_pos();
+	ObjectID get_history_obj(int p_obj) const;
+
 	bool next();
 	bool previous();
 	ObjectID get_current();
@@ -129,6 +136,7 @@ private:
 		int history_current;
 		Dictionary custom_state;
 		uint64_t version;
+		NodePath live_edit_root;
 
 
 	};
@@ -183,6 +191,8 @@ public:
 	uint64_t get_edited_scene_version() const;
 	uint64_t get_scene_version(int p_idx) const;
 	void clear_edited_scenes();
+	void set_edited_scene_live_edit_root(const NodePath& p_root);
+	NodePath get_edited_scene_live_edit_root();
 
 
 	void set_plugin_window_layout(Ref<ConfigFile> p_layout);
diff --git a/tools/editor/editor_file_dialog.cpp b/tools/editor/editor_file_dialog.cpp
index b1bbd71f7b..c62347d129 100644
--- a/tools/editor/editor_file_dialog.cpp
+++ b/tools/editor/editor_file_dialog.cpp
@@ -190,7 +190,7 @@ void EditorFileDialog::_thumbnail_done(const String& p_path,const Ref<Texture>&
 void EditorFileDialog::_request_single_thumbnail(const String& p_path) {
 
 	EditorResourcePreview::get_singleton()->queue_resource_preview(p_path,this,"_thumbnail_done",p_path);
-	print_line("want file "+p_path);
+	//print_line("want file "+p_path);
 	set_process(true);
 	preview_waiting=true;
 	preview_wheel_timeout=0;
@@ -359,7 +359,7 @@ void EditorFileDialog::_item_dc_selected(int p_item) {
 
 	if (d["dir"]) {
 
-		print_line("change dir: "+String(d["name"]));
+		//print_line("change dir: "+String(d["name"]));
 		dir_access->change_dir(d["name"]);
 		if (mode==MODE_OPEN_FILE || mode==MODE_OPEN_FILES || mode==MODE_OPEN_DIR)
 			file->set_text("");
@@ -536,6 +536,7 @@ void EditorFileDialog::update_file_list() {
 
 			if (get_icon_func) {
 
+				
 				Ref<Texture> icon = get_icon_func(base_dir.plus_file(files.front()->get()));
 				//ti->set_icon(0,icon);
 				if (display_mode==DISPLAY_THUMBNAILS) {
diff --git a/tools/editor/editor_file_system.cpp b/tools/editor/editor_file_system.cpp
index d741087a9f..33e4a15c85 100644
--- a/tools/editor/editor_file_system.cpp
+++ b/tools/editor/editor_file_system.cpp
@@ -94,6 +94,12 @@ bool EditorFileSystemDirectory::get_file_meta(int p_idx) const {
 	return files[p_idx].meta.enabled;
 }
 
+Vector<String> EditorFileSystemDirectory::get_file_deps(int p_idx) const {
+
+	ERR_FAIL_INDEX_V(p_idx,files.size(),Vector<String>());
+	return files[p_idx].meta.deps;
+
+}
 Vector<String> EditorFileSystemDirectory::get_missing_sources(int p_idx) const {
 
 	ERR_FAIL_INDEX_V(p_idx,files.size(),Vector<String>());
@@ -118,7 +124,7 @@ bool EditorFileSystemDirectory::is_missing_sources(int p_idx) const {
 	return false;
 }
 
-String EditorFileSystemDirectory::get_file_type(int p_idx) const {
+StringName EditorFileSystemDirectory::get_file_type(int p_idx) const {
 
 	ERR_FAIL_INDEX_V(p_idx,files.size(),"");
 	return files[p_idx].type;
@@ -198,6 +204,13 @@ EditorFileSystemDirectory::ImportMeta EditorFileSystem::_get_meta(const String&
 		}
 		m.import_editor=imd->get_editor();
 	}
+
+	List<String> deps;
+	ResourceLoader::get_dependencies(p_path,&deps);
+	for(List<String>::Element *E=deps.front();E;E=E->next()) {
+		m.deps.push_back(E->get());
+	}
+
 	return m;
 }
 
@@ -358,7 +371,7 @@ void EditorFileSystem::_scan_scenes() {
 
 	String project=Globals::get_singleton()->get_resource_path();
 
-	String fscache = EditorSettings::get_singleton()->get_project_settings_path().plus_file("file_cache");
+	String fscache = EditorSettings::get_singleton()->get_project_settings_path().plus_file("filesystem_cache");
 	FileAccess *f =FileAccess::open(fscache,FileAccess::READ);
 
 	if (f) {
@@ -397,7 +410,7 @@ void EditorFileSystem::_scan_scenes() {
 
 			} else {
 				Vector<String> split = l.split("::");
-				ERR_CONTINUE( split.size() != 4);
+				ERR_CONTINUE( split.size() != 5);
 				String name = split[0];
 				String file;
 
@@ -429,6 +442,15 @@ void EditorFileSystem::_scan_scenes() {
 					}
 
 				}
+				String deps = split[4].strip_edges();
+				if (deps.length()) {
+					Vector<String> dp = deps.split("<>");
+					for(int i=0;i<dp.size();i++) {
+						String path=dp[i];
+						fc.meta.deps.push_back(path);
+					}
+				}
+
 				file_cache[name]=fc;
 
 				ERR_CONTINUE(!dc);
@@ -530,6 +552,7 @@ void EditorFileSystem::scan() {
 		thread = Thread::create(_thread_func,this,s);
 		//tree->hide();
 		//progress->show();
+
 	}
 
 
@@ -798,6 +821,14 @@ void EditorFileSystem::_save_type_cache_fs(DirItem *p_dir,FileAccess *p_file) {
 
 			}
 		}
+		s+="::";
+		for(int j=0;j<p_dir->files[i]->meta.deps.size();j++) {
+
+			if (j>0)
+				s+="<>";
+			s+=p_dir->files[i]->meta.deps[j];
+		}
+
 		p_file->store_line(s);
 	}
 
@@ -1037,6 +1068,13 @@ void EditorFileSystem::update_file(const String& p_file) {
 		return;
     }
 
+    if (!FileAccess::exists(p_file)) {
+	    //was removed
+	    fs->files.remove(cpos);
+	    call_deferred("emit_signal","filesystem_changed"); //update later
+	    return;
+
+    }
 
     String type = ResourceLoader::get_resource_type(p_file);
 
diff --git a/tools/editor/editor_file_system.h b/tools/editor/editor_file_system.h
index 3f413292fe..f79dd209ef 100644
--- a/tools/editor/editor_file_system.h
+++ b/tools/editor/editor_file_system.h
@@ -59,13 +59,14 @@ class EditorFileSystemDirectory : public Object {
 
 		Vector<Source> sources;
 		String import_editor;
+		Vector<String> deps;
 		bool enabled;
 
 	};
 
 	struct FileInfo {
 		String file;
-		String type;
+		StringName type;
 		uint64_t modified_time;
 
 		ImportMeta meta;
@@ -87,10 +88,11 @@ public:
 	int get_file_count() const;
 	String get_file(int p_idx) const;
 	String get_file_path(int p_idx) const;
-	String get_file_type(int p_idx) const;
+	StringName get_file_type(int p_idx) const;
 	bool get_file_meta(int p_idx) const;
 	bool is_missing_sources(int p_idx) const;
 	Vector<String> get_missing_sources(int p_idx) const;
+	Vector<String> get_file_deps(int p_idx) const;
 
 	EditorFileSystemDirectory *get_parent();
 
@@ -120,7 +122,7 @@ class EditorFileSystem : public Node {
 		String path;
 		String name;
 		Vector<DirItem*> dirs;
-		Vector<SceneItem*> files;
+		Vector<SceneItem*> files;		
 		~DirItem();
 	};
 
@@ -149,6 +151,7 @@ class EditorFileSystem : public Node {
 		String type;
 		uint64_t modification_time;
 		EditorFileSystemDirectory::ImportMeta meta;
+		Vector<String> deps;
 	};
 
 	struct DirCache {
diff --git a/tools/editor/editor_help.cpp b/tools/editor/editor_help.cpp
index 213c18e1b0..46ed2194a8 100644
--- a/tools/editor/editor_help.cpp
+++ b/tools/editor/editor_help.cpp
@@ -547,6 +547,7 @@ Error EditorHelp::_goto_desc(const String& p_class,bool p_update_history,int p_v
 		class_desc->pop();
 		class_desc->add_newline();
 		class_desc->add_newline();
+		class_desc->add_newline();
 
 	}
 
@@ -563,6 +564,7 @@ Error EditorHelp::_goto_desc(const String& p_class,bool p_update_history,int p_v
 		_add_text(cd.brief_description);
 		class_desc->add_newline();
 		class_desc->add_newline();
+		class_desc->add_newline();
 	}
 
 	bool method_descr=false;
@@ -637,7 +639,6 @@ Error EditorHelp::_goto_desc(const String& p_class,bool p_update_history,int p_v
 
 	if (cd.properties.size()) {
 
-
 		class_desc->push_color(EditorSettings::get_singleton()->get("text_editor/keyword_color"));
 		class_desc->push_font(doc_title_font);
 		class_desc->add_text("Members:");
@@ -715,9 +716,10 @@ Error EditorHelp::_goto_desc(const String& p_class,bool p_update_history,int p_v
 			class_desc->add_newline();
 		}
 
-		class_desc->add_newline();
 		class_desc->pop();
 
+		class_desc->add_newline();
+		class_desc->add_newline();
 
 	}
 	if (cd.signals.size()) {
@@ -779,6 +781,7 @@ Error EditorHelp::_goto_desc(const String& p_class,bool p_update_history,int p_v
 
 		class_desc->pop();
 		class_desc->add_newline();
+		class_desc->add_newline();
 
 	}
 
@@ -823,6 +826,7 @@ Error EditorHelp::_goto_desc(const String& p_class,bool p_update_history,int p_v
 
 		class_desc->pop();
 		class_desc->add_newline();
+		class_desc->add_newline();
 
 
 	}
@@ -830,6 +834,7 @@ Error EditorHelp::_goto_desc(const String& p_class,bool p_update_history,int p_v
 	if (cd.description!="") {
 
 		description_line=class_desc->get_line_count()-2;
+
 		class_desc->push_color(EditorSettings::get_singleton()->get("text_editor/keyword_color"));
 		class_desc->push_font(doc_title_font);
 		class_desc->add_text("Description:");
@@ -837,10 +842,10 @@ Error EditorHelp::_goto_desc(const String& p_class,bool p_update_history,int p_v
 		class_desc->pop();
 
 		class_desc->add_newline();
-		class_desc->add_newline();
 		_add_text(cd.description);
 		class_desc->add_newline();
 		class_desc->add_newline();
+		class_desc->add_newline();
 	}
 
 	if (method_descr) {
@@ -853,12 +858,16 @@ Error EditorHelp::_goto_desc(const String& p_class,bool p_update_history,int p_v
 
 		class_desc->add_newline();
 		class_desc->add_newline();
+		class_desc->push_indent(1);
 
 
 		for(int i=0;i<cd.methods.size();i++) {
 
 			method_line[cd.methods[i].name]=class_desc->get_line_count()-2;
 
+			if( cd.methods[i].description != "") {
+				class_desc->add_newline();
+			}
 			class_desc->push_font(doc_code_font);
 			_add_type(cd.methods[i].return_type);
 
@@ -899,9 +908,12 @@ Error EditorHelp::_goto_desc(const String& p_class,bool p_update_history,int p_v
 
 			class_desc->pop();
 
-			class_desc->add_newline();
-			class_desc->add_newline();
-			_add_text(cd.methods[i].description);
+			if( cd.methods[i].description != "") {
+				class_desc->add_text("  ");
+				_add_text(cd.methods[i].description);
+				class_desc->add_newline();
+				class_desc->add_newline();
+			}
 			class_desc->add_newline();
 			class_desc->add_newline();
 
@@ -1392,6 +1404,8 @@ EditorHelp::EditorHelp(EditorNode *p_editor) {
 		PanelContainer *pc = memnew( PanelContainer );
 		Ref<StyleBoxFlat> style( memnew( StyleBoxFlat ) );
 		style->set_bg_color( EditorSettings::get_singleton()->get("text_editor/background_color") );	
+		style->set_default_margin(MARGIN_LEFT,20);
+		style->set_default_margin(MARGIN_TOP,20);
 		pc->add_style_override("panel", style); //get_stylebox("normal","TextEdit"));
 		h_split->add_child(pc);
 		class_desc = memnew( RichTextLabel );
diff --git a/tools/editor/editor_import_export.cpp b/tools/editor/editor_import_export.cpp
index 4e6435b22e..b13473e61c 100644
--- a/tools/editor/editor_import_export.cpp
+++ b/tools/editor/editor_import_export.cpp
@@ -40,6 +40,7 @@
 #include "io/resource_saver.h"
 #include "io/md5.h"
 #include "io_plugins/editor_texture_import_plugin.h"
+#include "tools/editor/plugins/script_editor_plugin.h"
 
 String EditorImportPlugin::validate_source_path(const String& p_path) {
 
@@ -254,7 +255,16 @@ static void _add_filter_to_list(Set<StringName>& r_list,const String& p_filter)
 
 }
 
+Vector<uint8_t> EditorExportPlatform::get_exported_file_default(String& p_fname) const {
 
+	FileAccess *f = FileAccess::open(p_fname,FileAccess::READ);
+	ERR_FAIL_COND_V(!f,Vector<uint8_t>());
+	Vector<uint8_t> ret;
+	ret.resize(f->get_len());
+	int rbs = f->get_buffer(ret.ptr(),ret.size());
+	memdelete(f);
+	return ret;
+}
 
 Vector<uint8_t> EditorExportPlatform::get_exported_file(String& p_fname) const {
 
@@ -269,13 +279,9 @@ Vector<uint8_t> EditorExportPlatform::get_exported_file(String& p_fname) const {
 	}
 
 
-	FileAccess *f = FileAccess::open(p_fname,FileAccess::READ);
-	ERR_FAIL_COND_V(!f,Vector<uint8_t>());
-	Vector<uint8_t> ret;
-	ret.resize(f->get_len());
-	int rbs = f->get_buffer(ret.ptr(),ret.size());
-	memdelete(f);
-	return ret;
+	return get_exported_file_default(p_fname);
+
+
 }
 
 Vector<StringName> EditorExportPlatform::get_dependencies(bool p_bundles) const {
@@ -556,6 +562,7 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func
 		group_shrink*=EditorImportExport::get_singleton()->get_export_image_shrink();
 
 		switch(EditorImportExport::get_singleton()->image_export_group_get_image_action(E->get())) {
+			case EditorImportExport::IMAGE_ACTION_KEEP:
 			case EditorImportExport::IMAGE_ACTION_NONE: {
 
 				switch(EditorImportExport::get_singleton()->get_export_image_action()) {
@@ -580,7 +587,7 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func
 			} break; //use default
 			case EditorImportExport::IMAGE_ACTION_COMPRESS_RAM: {
 				group_format=EditorTextureImportPlugin::IMAGE_FORMAT_COMPRESS_RAM;
-			} break; //use default
+			} break; //use default						
 		}
 
 		String image_list_md5;
@@ -824,13 +831,43 @@ Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func
 
 
 	StringName engine_cfg="res://engine.cfg";
+	StringName boot_splash;
+	{
+		String splash=Globals::get_singleton()->get("application/boot_splash"); //avoid splash from being converted
+		splash=splash.strip_edges();
+		if (splash!=String()) {
+			if (!splash.begins_with("res://"))
+				splash="res://"+splash;
+			splash=splash.simplify_path();
+			boot_splash=splash;
+		}
+	}
+	StringName custom_cursor;
+	{
+		String splash=Globals::get_singleton()->get("display/custom_mouse_cursor"); //avoid splash from being converted
+		splash=splash.strip_edges();
+		if (splash!=String()) {
+			if (!splash.begins_with("res://"))
+				splash="res://"+splash;
+			splash=splash.simplify_path();
+			custom_cursor=splash;
+		}
+	}
+
+
+
 
 	for(int i=0;i<files.size();i++) {
 
 		if (remap_files.has(files[i]) || files[i]==engine_cfg) //gonna be remapped (happened before!)
 			continue; //from atlas?
 		String src=files[i];
-		Vector<uint8_t> buf = get_exported_file(src);
+		Vector<uint8_t> buf;
+
+		if (src==boot_splash || src==custom_cursor)
+			buf = get_exported_file_default(src); //bootsplash must be kept if used
+		else
+			buf = get_exported_file(src);
 
 		ERR_CONTINUE( saved.has(src) );
 
@@ -916,6 +953,59 @@ static int _get_pad(int p_alignment, int p_n) {
 	return pad;
 };
 
+void EditorExportPlatform::gen_export_flags(Vector<String> &r_flags, int p_flags) {
+
+	String host = EditorSettings::get_singleton()->get("network/debug_host");
+
+	if (p_flags&EXPORT_DUMB_CLIENT) {
+		int port = EditorSettings::get_singleton()->get("file_server/port");
+		String passwd = EditorSettings::get_singleton()->get("file_server/password");
+		r_flags.push_back("-rfs");
+		r_flags.push_back(host+":"+itos(port));
+		if (passwd!="") {
+			r_flags.push_back("-rfs_pass");
+			r_flags.push_back(passwd);
+		}
+	}
+
+	if (p_flags&EXPORT_REMOTE_DEBUG) {
+
+		r_flags.push_back("-rdebug");
+		r_flags.push_back(host+":"+String::num(GLOBAL_DEF("debug/debug_port", 6007)));
+
+		List<String> breakpoints;
+		ScriptEditor::get_singleton()->get_breakpoints(&breakpoints);
+
+
+		if (breakpoints.size()) {
+
+			r_flags.push_back("-bp");
+			String bpoints;
+			for(const List<String>::Element *E=breakpoints.front();E;E=E->next()) {
+
+				bpoints+=E->get().replace(" ","%20");
+				if (E->next())
+					bpoints+=",";
+			}
+
+			r_flags.push_back(bpoints);
+		}
+
+	}
+
+	if (p_flags&EXPORT_VIEW_COLLISONS) {
+
+		r_flags.push_back("-debugcol");
+	}
+
+	if (p_flags&EXPORT_VIEW_NAVIGATION) {
+
+		r_flags.push_back("-debugnav");
+	}
+
+
+}
+
 Error EditorExportPlatform::save_pack_file(void *p_userdata,const String& p_path, const Vector<uint8_t>& p_data,int p_file,int p_total) {
 
 
@@ -1029,7 +1119,7 @@ Error EditorExportPlatform::save_pack(FileAccess *dst,bool p_make_bundles, int p
 	return OK;
 }
 
-Error EditorExportPlatformPC::export_project(const String& p_path, bool p_debug, bool p_dumb) {
+Error EditorExportPlatformPC::export_project(const String& p_path, bool p_debug, int p_flags) {
 
 
 
@@ -1330,12 +1420,12 @@ EditorImportExport::ImageAction EditorImportExport::get_export_image_action() co
 	return image_action;
 }
 
-void EditorImportExport::set_export_image_shrink(int p_shrink) {
+void EditorImportExport::set_export_image_shrink(float p_shrink) {
 
 	image_shrink=p_shrink;
 }
 
-int EditorImportExport::get_export_image_shrink() const{
+float EditorImportExport::get_export_image_shrink() const{
 
 	return image_shrink;
 }
@@ -1406,12 +1496,12 @@ bool EditorImportExport::image_export_group_get_make_atlas(const StringName& p_e
 	return image_groups[p_export_group].make_atlas;
 
 }
-void EditorImportExport::image_export_group_set_shrink(const StringName& p_export_group,int p_amount){
+void EditorImportExport::image_export_group_set_shrink(const StringName& p_export_group,float p_amount){
 	ERR_FAIL_COND(!image_groups.has(p_export_group));
 	image_groups[p_export_group].shrink=p_amount;
 
 }
-int EditorImportExport::image_export_group_get_shrink(const StringName& p_export_group) const{
+float EditorImportExport::image_export_group_get_shrink(const StringName& p_export_group) const{
 
 	ERR_FAIL_COND_V(!image_groups.has(p_export_group),1);
 	return image_groups[p_export_group].shrink;
@@ -1565,6 +1655,8 @@ void EditorImportExport::load_config() {
 					g.action=IMAGE_ACTION_COMPRESS_RAM;
 				else if (action=="compress_disk")
 					g.action=IMAGE_ACTION_COMPRESS_DISK;
+				else if (action=="keep")
+					g.action=IMAGE_ACTION_KEEP;
 			}
 
 			if (d.has("atlas"))
@@ -1692,6 +1784,7 @@ void EditorImportExport::save_config() {
 			case IMAGE_ACTION_NONE: d["action"]="default"; break;
 			case IMAGE_ACTION_COMPRESS_RAM: d["action"]="compress_ram"; break;
 			case IMAGE_ACTION_COMPRESS_DISK: d["action"]="compress_disk"; break;
+			case IMAGE_ACTION_KEEP: d["action"]="keep"; break;
 		}
 
 
diff --git a/tools/editor/editor_import_export.h b/tools/editor/editor_import_export.h
index 9704d4a695..245adffbfd 100644
--- a/tools/editor/editor_import_export.h
+++ b/tools/editor/editor_import_export.h
@@ -83,6 +83,7 @@ public:
 	typedef Error (*EditorExportSaveFunction)(void *p_userdata,const String& p_path, const Vector<uint8_t>& p_data,int p_file,int p_total);
 protected:
 
+	Vector<uint8_t> get_exported_file_default(String& p_fname) const;
 	virtual Vector<uint8_t> get_exported_file(String& p_fname) const;
 	virtual Vector<StringName> get_dependencies(bool p_bundles) const;
 
@@ -104,6 +105,7 @@ protected:
 
 	};
 
+	void gen_export_flags(Vector<String> &r_flags, int p_flags);
 	static Error save_pack_file(void *p_userdata,const String& p_path, const Vector<uint8_t>& p_data,int p_file,int p_total);
 
 public:
@@ -119,6 +121,13 @@ public:
 		IMAGE_COMPRESSION_ETC2, // ericsson new compression format (can handle alpha)
 	};
 
+	enum ExportFlags {
+		EXPORT_DUMB_CLIENT=1,
+		EXPORT_REMOTE_DEBUG=2,
+		EXPORT_VIEW_COLLISONS=4,
+		EXPORT_VIEW_NAVIGATION=8
+	};
+
 
 	Error export_project_files(EditorExportSaveFunction p_func, void* p_udata,bool p_make_bundles);
 
@@ -131,14 +140,14 @@ public:
 	virtual int get_device_count() const { return 0; }
 	virtual String get_device_name(int p_device) const { return ""; }
 	virtual String get_device_info(int p_device) const { return ""; }
-	virtual Error run(int p_device,bool p_dumb=false) { return OK; }
+	virtual Error run(int p_device,int p_flags) { return OK; }
 
 	virtual bool can_export(String *r_error=NULL) const=0;
 
 
 	virtual bool requieres_password(bool p_debug) const { return false; }
 	virtual String get_binary_extension() const=0;
-	virtual Error export_project(const String& p_path,bool p_debug,bool p_dumb=false)=0;
+	virtual Error export_project(const String& p_path,bool p_debug,int p_flags=0)=0;
 
 	EditorExportPlatform() {};
 };
@@ -188,7 +197,7 @@ public:
 	virtual ImageCompression get_image_compression() const { return IMAGE_COMPRESSION_BC; }
 
 	virtual String get_binary_extension() const { return binary_extension; }
-	virtual Error export_project(const String& p_path,bool p_debug,bool p_dumb=false);
+	virtual Error export_project(const String& p_path, bool p_debug, int p_flags=0);
 	virtual void set_release_binary32(const String& p_binary) { release_binary32=p_binary; }
 	virtual void set_debug_binary32(const String& p_binary) { debug_binary32=p_binary; }
 	virtual void set_release_binary64(const String& p_binary) { release_binary64=p_binary; }
@@ -226,6 +235,8 @@ public:
 		IMAGE_ACTION_NONE,
 		IMAGE_ACTION_COMPRESS_DISK,
 		IMAGE_ACTION_COMPRESS_RAM,
+		IMAGE_ACTION_KEEP //for group
+
 	};
 
 	enum ScriptAction {
@@ -241,7 +252,7 @@ protected:
 		ImageAction action;
 		bool make_atlas;
 		float lossy_quality;
-		int shrink;
+		float shrink;
 	};
 
 	Vector<Ref<EditorExportPlugin> > export_plugins;
@@ -249,7 +260,7 @@ protected:
 	Map<String,int> by_idx;
 	ImageAction image_action;
 	float image_action_compress_quality;
-	int image_shrink;
+	float image_shrink;
 	Set<String> image_formats;
 
 	ExportFilter export_filter;
@@ -299,8 +310,8 @@ public:
 	void set_export_image_action(ImageAction p_action);
 	ImageAction get_export_image_action() const;
 
-	void set_export_image_shrink(int p_shrink);
-	int get_export_image_shrink() const;
+	void set_export_image_shrink(float p_shrink);
+	float get_export_image_shrink() const;
 
 	void set_export_image_quality(float p_quality);
 	float get_export_image_quality() const;
@@ -315,8 +326,8 @@ public:
 	ImageAction image_export_group_get_image_action(const StringName& p_export_group) const;
 	void image_export_group_set_make_atlas(const StringName& p_export_group,bool p_make);
 	bool image_export_group_get_make_atlas(const StringName& p_export_group) const;
-	void image_export_group_set_shrink(const StringName& p_export_group,int p_amount);
-	int image_export_group_get_shrink(const StringName& p_export_group) const;
+	void image_export_group_set_shrink(const StringName& p_export_group,float p_amount);
+	float image_export_group_get_shrink(const StringName& p_export_group) const;
 	void image_export_group_set_lossy_quality(const StringName& p_export_group,float p_quality);
 	float image_export_group_get_lossy_quality(const StringName& p_export_group) const;
 
diff --git a/tools/editor/editor_log.cpp b/tools/editor/editor_log.cpp
index 8d49655960..2d26490a8a 100644
--- a/tools/editor/editor_log.cpp
+++ b/tools/editor/editor_log.cpp
@@ -104,6 +104,17 @@ void EditorLog::_close_request() {
 }
 
 
+void EditorLog::_clear_request() {
+
+	log->clear();
+
+}
+
+void EditorLog::clear() {
+	_clear_request();
+}
+
+
 void EditorLog::add_message(const String& p_msg,bool p_error) {
 
 
@@ -167,9 +178,12 @@ void EditorLog::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("_close_request"),&EditorLog::_close_request );
 	ObjectTypeDB::bind_method(_MD("_flip_request"),&EditorLog::_flip_request );
+	ObjectTypeDB::bind_method(_MD("_clear_request"),&EditorLog::_clear_request );
+
 	//ObjectTypeDB::bind_method(_MD("_dragged"),&EditorLog::_dragged );
 	ADD_SIGNAL( MethodInfo("close_request"));
 	ADD_SIGNAL( MethodInfo("show_request"));
+	ADD_SIGNAL( MethodInfo("clear_request"));
 }
 
 EditorLog::EditorLog() {
@@ -198,6 +212,11 @@ EditorLog::EditorLog() {
 	//pd->connect("dragged",this,"_dragged");
 	//pd->set_default_cursor_shape(Control::CURSOR_MOVE);
 
+	clearbutton = memnew( Button );
+	hb->add_child(clearbutton);
+	clearbutton->set_text("Clear");
+	clearbutton->connect("pressed", this,"_clear_request");
+
 	tb = memnew( TextureButton );
 	hb->add_child(tb);
 	tb->connect("pressed",this,"_close_request");
@@ -241,8 +260,8 @@ void EditorLog::deinit() {
 
 }
 
+
 EditorLog::~EditorLog() {
 
 
 }
-
diff --git a/tools/editor/editor_log.h b/tools/editor/editor_log.h
index 1141d03911..6950ffa1a0 100644
--- a/tools/editor/editor_log.h
+++ b/tools/editor/editor_log.h
@@ -45,6 +45,7 @@ class EditorLog : public PanelContainer {
 	OBJ_TYPE( EditorLog, PanelContainer );
 
 	ToolButton *button;
+	Button *clearbutton;
 	Label *title;
 	RichTextLabel *log;
 	TextureButton *tb;
@@ -58,10 +59,10 @@ class EditorLog : public PanelContainer {
 
 	Thread::ID current;
 
-
 //	void _dragged(const Point2& p_ofs);
 	void _close_request();
 	void _flip_request();
+	void _clear_request();
 	static void _undo_redo_cbk(void *p_self,const String& p_name);
 protected:
 
@@ -73,6 +74,7 @@ public:
 	void deinit();
 
 	ToolButton *get_button();
+	void clear();
 	EditorLog();
 	~EditorLog();
 };
diff --git a/tools/editor/editor_node.cpp b/tools/editor/editor_node.cpp
index 7789008c62..a3d7cbd7cf 100644
--- a/tools/editor/editor_node.cpp
+++ b/tools/editor/editor_node.cpp
@@ -58,6 +58,7 @@
 
 // plugins
 #include "plugins/sprite_frames_editor_plugin.h"
+#include "plugins/sprite_region_editor_plugin.h"
 #include "plugins/canvas_item_editor_plugin.h"
 #include "plugins/spatial_editor_plugin.h"
 #include "plugins/sample_editor_plugin.h"
@@ -93,6 +94,7 @@
 #include "plugins/light_occluder_2d_editor_plugin.h"
 #include "plugins/color_ramp_editor_plugin.h"
 #include "plugins/collision_shape_2d_editor_plugin.h"
+#include "main/input_default.h"
 // end
 #include "tools/editor/io_plugins/editor_texture_import_plugin.h"
 #include "tools/editor/io_plugins/editor_scene_import_plugin.h"
@@ -103,6 +105,7 @@
 
 #include "plugins/editor_preview_plugins.h"
 
+#include "script_editor_debugger.h"
 
 EditorNode *EditorNode::singleton=NULL;
 
@@ -457,17 +460,74 @@ void EditorNode::open_resource(const String& p_type) {
 	current_option=RESOURCE_LOAD;
 }
 
-void EditorNode::save_resource(const Ref<Resource>& p_resource) {
 
+void EditorNode::save_resource_in_path(const Ref<Resource>& p_resource,const String& p_path) {
+
+	editor_data.apply_changes_in_editors();
+	int flg=0;
+	if (EditorSettings::get_singleton()->get("on_save/compress_binary_resources"))
+		flg|=ResourceSaver::FLAG_COMPRESS;
+	if (EditorSettings::get_singleton()->get("on_save/save_paths_as_relative"))
+		flg|=ResourceSaver::FLAG_RELATIVE_PATHS;
+
+	String path = Globals::get_singleton()->localize_path(p_path);
+	Error err = ResourceSaver::save(path,p_resource,flg|ResourceSaver::FLAG_REPLACE_SUBRESOURCE_PATHS);
+
+	if (err!=OK) {
+		accept->set_text("Error saving resource!");
+		accept->popup_centered_minsize();
+	return;
+	}
+//	EditorFileSystem::get_singleton()->update_file(path,p_resource->get_type());
+
+	((Resource*)p_resource.ptr())->set_path(path);
+	emit_signal("resource_saved",p_resource);
+
+}
+
+void EditorNode::save_resource(const Ref<Resource>& p_resource) {
 
-	ERR_FAIL_COND(p_resource.is_null() || p_resource->get_path()=="" || p_resource->get_path().find("::")!=-1);
-	resources_dock->save_resource(p_resource->get_path(),p_resource);
+	if (p_resource->get_path().is_resource_file()) {
+		save_resource_in_path(p_resource,p_resource->get_path());
+	} else {
+		save_resource_as(p_resource);
+	}
 }
 
 void EditorNode::save_resource_as(const Ref<Resource>& p_resource) {
 
-	resources_dock->save_resource_as(p_resource);
+	file->set_mode(EditorFileDialog::MODE_SAVE_FILE);
+	bool relpaths =  (p_resource->has_meta("__editor_relpaths__") && p_resource->get_meta("__editor_relpaths__").operator bool());
 
+	List<String> extensions;
+	Ref<PackedScene> sd = memnew( PackedScene );
+	ResourceSaver::get_recognized_extensions(p_resource,&extensions);
+	file->clear_filters();
+	for(int i=0;i<extensions.size();i++) {
+
+		file->add_filter("*."+extensions[i]+" ; "+extensions[i].to_upper());
+	}
+
+	//file->set_current_path(current_path);
+	if (p_resource->get_path()!="") {
+		file->set_current_path(p_resource->get_path());
+		if (extensions.size()) {
+			String ext=p_resource->get_path().extension().to_lower();
+			if (extensions.find(ext)==NULL) {
+				file->set_current_path(p_resource->get_path().replacen("."+ext,"."+extensions.front()->get()));
+			}
+		}
+	} else {
+
+		String existing;
+		if (extensions.size()) {
+			existing="new_"+p_resource->get_type().to_lower()+"."+extensions.front()->get().to_lower();
+		}
+		file->set_current_path(existing);
+
+	}
+	file->popup_centered_ratio();
+	file->set_title("Save Resource As..");
 }
 
 
@@ -916,6 +976,7 @@ void EditorNode::_save_scene(String p_file) {
 		//EditorFileSystem::get_singleton()->update_file(p_file,sdata->get_type());
 		set_current_version(editor_data.get_undo_redo().get_version());
 		_update_title();
+		_update_scene_tabs();
 	} else {
 
 		_dialog_display_file_error(p_file,err);
@@ -1047,6 +1108,11 @@ void EditorNode::_dialog_action(String p_file) {
 
 
 			push_item(res.operator->() );
+		} break;			
+		case FILE_NEW_INHERITED_SCENE: {
+
+
+			load_scene(p_file,false,true);
 		} break;
 		case FILE_OPEN_SCENE: {
 
@@ -1318,10 +1384,22 @@ void EditorNode::_dialog_action(String p_file) {
 			unzClose(pkg);
 
 		} break;
+		case RESOURCE_SAVE:
+		case RESOURCE_SAVE_AS: {
 
+
+			uint32_t current = editor_history.get_current();
+			Object *current_obj = current>0 ? ObjectDB::get_instance(current) : NULL;
+
+			ERR_FAIL_COND(!current_obj->cast_to<Resource>())
+
+			RES current_res = RES(current_obj->cast_to<Resource>());
+
+			save_resource_in_path(current_res,p_file);
+
+		} break;
 		default: { //save scene?
 		
-			
 			if (file->get_mode()==FileDialog::MODE_SAVE_FILE) {
 
 				//_save_scene(p_file);
@@ -1356,6 +1434,67 @@ void EditorNode::push_item(Object *p_object,const String& p_property) {
 
 }
 
+void EditorNode::_select_history(int p_idx) {
+
+	//push it to the top, it is not correct, but it's more useful
+	ObjectID id=editor_history.get_history_obj(p_idx);
+	Object* obj=ObjectDB::get_instance(id);
+	if (!obj)
+		return;
+	push_item(obj);
+}
+
+void EditorNode::_prepare_history() {
+
+	int history_to = MAX(0,editor_history.get_history_len()-25);
+
+	editor_history_menu->get_popup()->clear();
+
+	Ref<Texture> base_icon = gui_base->get_icon("Object","EditorIcons");
+	Set<ObjectID> already;
+	for(int i=editor_history.get_history_len()-1;i>=history_to;i--) {
+
+
+		ObjectID id=editor_history.get_history_obj(i);
+		Object* obj=ObjectDB::get_instance(id);
+		if (!obj || already.has(id)) {
+			if (history_to>0) {
+				history_to--;
+			}
+			continue;
+		}
+
+		already.insert(id);
+
+		Ref<Texture> icon = gui_base->get_icon("Object","EditorIcons");
+		if (gui_base->has_icon(obj->get_type(),"EditorIcons"))
+			icon=gui_base->get_icon(obj->get_type(),"EditorIcons");
+		else
+			icon=base_icon;
+
+		String text;
+		if (obj->cast_to<Resource>()) {
+			Resource *r=obj->cast_to<Resource>();
+			if (r->get_path().is_resource_file())
+				text=r->get_path().get_file();
+			else if (r->get_name()!=String()) {
+				text=r->get_name();
+			} else {
+				text=r->get_type();
+			}
+		} else if (obj->cast_to<Node>()) {
+			text=obj->cast_to<Node>()->get_name();
+		} else {
+			text=obj->get_type();
+		}
+
+		if (i==editor_history.get_history_pos()) {
+			text="["+text+"]";
+		}
+		editor_history_menu->get_popup()->add_icon_item(icon,text,i);
+	}
+}
+
 void EditorNode::_property_editor_forward() {
 
 	if (editor_history.next())
@@ -1400,6 +1539,9 @@ void EditorNode::_edit_current() {
 	uint32_t current = editor_history.get_current();
 	Object *current_obj = current>0 ? ObjectDB::get_instance(current) : NULL;
 
+	property_back->set_disabled( editor_history.is_at_begining() );
+	property_forward->set_disabled( editor_history.is_at_end() );
+
 	this->current=current_obj;
 	editor_path->update_path();
 
@@ -1414,7 +1556,10 @@ void EditorNode::_edit_current() {
 
 	object_menu->set_disabled(true);
 
-	if (current_obj->is_type("Resource")) {
+	bool is_resource = current_obj->is_type("Resource");
+	resource_save_button->set_disabled(!is_resource);
+
+	if (is_resource) {
 
 
 		Resource *current_res = current_obj->cast_to<Resource>();
@@ -1423,12 +1568,11 @@ void EditorNode::_edit_current() {
 		property_editor->edit( current_res );
 		object_menu->set_disabled(false);
 
-		resources_dock->add_resource(Ref<Resource>(current_res));
-		//top_pallete->set_current_tab(1);
-	}
+		//resources_dock->add_resource(Ref<Resource>(current_res));
 
 
-	if (current_obj->is_type("Node")) {
+		//top_pallete->set_current_tab(1);
+	} else if (current_obj->is_type("Node")) {
 
 		Node * current_node = current_obj->cast_to<Node>();
 		ERR_FAIL_COND(!current_node);
@@ -1443,6 +1587,12 @@ void EditorNode::_edit_current() {
 
 		//top_pallete->set_current_tab(0);
 
+	} else {
+
+		property_editor->edit( current_obj );
+		//scene_tree_dock->set_selected(current_node);
+		//object_menu->get_popup()->clear();
+
 	}
 
 	/* Take care of PLUGIN EDITOR */
@@ -1515,7 +1665,13 @@ void EditorNode::_edit_current() {
 	p->add_item("Copy Params",OBJECT_COPY_PARAMS);
 	p->add_item("Set Params",OBJECT_PASTE_PARAMS);
 	p->add_separator();
-	p->add_item("Make Resources Unique",OBJECT_UNIQUE_RESOURCES);
+	p->add_item("Paste Resource",RESOURCE_PASTE);
+	if (is_resource) {
+		p->add_item("Copy Resource",RESOURCE_COPY);
+		p->add_item("Make Built-In",RESOURCE_UNREF);
+	}
+	p->add_separator();
+	p->add_item("Make Sub-Resources Unique",OBJECT_UNIQUE_RESOURCES);
 	p->add_separator();
 	p->add_icon_item(gui_base->get_icon("Help","EditorIcons"),"Class Reference",OBJECT_REQUEST_HELP);
 	List<MethodInfo> methods;
@@ -1548,6 +1704,20 @@ void EditorNode::_edit_current() {
 	_update_keying();
 }
 
+void EditorNode::_resource_created() {
+
+	Object *c = create_dialog->instance_selected();
+
+	ERR_FAIL_COND(!c);
+	Resource *r = c->cast_to<Resource>();
+	ERR_FAIL_COND(!r);
+
+	REF res( r );
+
+	push_item(c);
+
+}
+
 void EditorNode::_resource_selected(const RES& p_res,const String& p_property) {
 	
 
@@ -1585,7 +1755,6 @@ void EditorNode::_run(bool p_current,const String& p_custom) {
 		Node *scene = editor_data.get_edited_scene_root();
 
 		if (!scene) {
-
 			current_option=-1;
 			//accept->get_cancel()->hide();
 			accept->get_ok()->set_text("I see..");
@@ -1666,6 +1835,10 @@ void EditorNode::_run(bool p_current,const String& p_custom) {
 		editor_data.save_editor_external_data();
 	}
 
+	if (bool(EDITOR_DEF("run/always_clear_output_on_play", true))) {
+		log->clear();
+	}
+
 
 	List<String> breakpoints;
 	editor_data.get_editor_breakpoints(&breakpoints);
@@ -1757,11 +1930,13 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 
 			int idx = editor_data.add_edited_scene(-1);
 			_scene_tab_changed(idx);
+			editor_data.clear_editor_states();
 
 			//_cleanup_scene();
 
 			
 		} break;
+		case FILE_NEW_INHERITED_SCENE:
 		case FILE_OPEN_SCENE: {
 			
 			
@@ -1782,7 +1957,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 			if (scene) {
 				file->set_current_path(scene->get_filename());
 			};
-			file->set_title("Open Scene");
+			file->set_title(p_option==FILE_OPEN_SCENE?"Open Scene":"Open Base Scene");
 			file->popup_centered_ratio();
 			
 		} break;
@@ -1799,6 +1974,13 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 			quick_open->set_title("Quick Open Script..");
 
 		} break;
+		case FILE_QUICK_OPEN_FILE: {
+
+
+			quick_open->popup("Resource",false,true);
+			quick_open->set_title("Quick Search File..");
+
+		} break;
 		case FILE_RUN_SCRIPT: {
 
 			file_script->popup_centered_ratio();
@@ -2261,7 +2443,70 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 
 		} break;
 #endif
-		
+		case RESOURCE_NEW: {
+
+			create_dialog->popup_centered_ratio();
+		} break;
+		case RESOURCE_LOAD: {
+
+			open_resource();
+		} break;
+		case RESOURCE_SAVE: {
+
+
+			uint32_t current = editor_history.get_current();
+			Object *current_obj = current>0 ? ObjectDB::get_instance(current) : NULL;
+
+			ERR_FAIL_COND(!current_obj->cast_to<Resource>())
+
+			RES current_res = RES(current_obj->cast_to<Resource>());
+
+			save_resource(current_res);
+
+		} break;
+		case RESOURCE_SAVE_AS: {
+
+			uint32_t current = editor_history.get_current();
+			Object *current_obj = current>0 ? ObjectDB::get_instance(current) : NULL;
+
+			ERR_FAIL_COND(!current_obj->cast_to<Resource>())
+
+			RES current_res = RES(current_obj->cast_to<Resource>());
+
+			save_resource_as(current_res);
+
+		} break;
+		case RESOURCE_UNREF: {
+
+			uint32_t current = editor_history.get_current();
+			Object *current_obj = current>0 ? ObjectDB::get_instance(current) : NULL;
+
+			ERR_FAIL_COND(!current_obj->cast_to<Resource>())
+
+			RES current_res = RES(current_obj->cast_to<Resource>());
+			current_res->set_path("");
+			_edit_current();
+		} break;
+		case RESOURCE_COPY: {
+
+			uint32_t current = editor_history.get_current();
+			Object *current_obj = current>0 ? ObjectDB::get_instance(current) : NULL;
+
+			ERR_FAIL_COND(!current_obj->cast_to<Resource>())
+
+			RES current_res = RES(current_obj->cast_to<Resource>());
+
+			EditorSettings::get_singleton()->set_resource_clipboard(current_res);
+
+		} break;
+		case RESOURCE_PASTE: {
+
+			RES r = EditorSettings::get_singleton()->get_resource_clipboard();
+			if (r.is_valid()) {
+				push_item(EditorSettings::get_singleton()->get_resource_clipboard().ptr(),String());
+			}
+
+		} break;
 		case OBJECT_REQUEST_HELP: {
 
 			if (current) {
@@ -2364,6 +2609,13 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 			_run(true);
 
 		} break;
+		case RUN_PLAY_NATIVE: {
+
+			emit_signal("play_pressed");
+			editor_run.run_native_notify();
+
+
+		} break;
 		case RUN_SCENE_SETTINGS: {
 
 			run_settings_dialog->popup_run_settings();
@@ -2395,28 +2647,57 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
 		case RUN_FILE_SERVER: {
 
 			//file_server
-			bool ischecked = fileserver_menu->get_popup()->is_item_checked( fileserver_menu->get_popup()->get_item_index(RUN_FILE_SERVER));
+			bool ischecked = debug_button->get_popup()->is_item_checked( debug_button->get_popup()->get_item_index(RUN_FILE_SERVER));
 
 			if (ischecked) {
 				file_server->stop();
-				fileserver_menu->set_icon(gui_base->get_icon("FileServer","EditorIcons"));
-				fileserver_menu->get_popup()->set_item_text( fileserver_menu->get_popup()->get_item_index(RUN_FILE_SERVER),"Enable File Server");
+				//debug_button->set_icon(gui_base->get_icon("FileServer","EditorIcons"));
+				//debug_button->get_popup()->set_item_text( debug_button->get_popup()->get_item_index(RUN_FILE_SERVER),"Enable File Server");
 			} else {
 				file_server->start();
-				fileserver_menu->set_icon(gui_base->get_icon("FileServerActive","EditorIcons"));
-				fileserver_menu->get_popup()->set_item_text( fileserver_menu->get_popup()->get_item_index(RUN_FILE_SERVER),"Disable File Server");
+				//debug_button->set_icon(gui_base->get_icon("FileServerActive","EditorIcons"));
+				//debug_button->get_popup()->set_item_text( debug_button->get_popup()->get_item_index(RUN_FILE_SERVER),"Disable File Server");
 			}
 
-			fileserver_menu->get_popup()->set_item_checked( fileserver_menu->get_popup()->get_item_index(RUN_FILE_SERVER),!ischecked);
+			debug_button->get_popup()->set_item_checked( debug_button->get_popup()->get_item_index(RUN_FILE_SERVER),!ischecked);
+
+		} break;
+		case RUN_LIVE_DEBUG: {
+
+			bool ischecked = debug_button->get_popup()->is_item_checked( debug_button->get_popup()->get_item_index(RUN_LIVE_DEBUG));
 
+			debug_button->get_popup()->set_item_checked( debug_button->get_popup()->get_item_index(RUN_LIVE_DEBUG),!ischecked);
+			ScriptEditor::get_singleton()->get_debugger()->set_live_debugging(!ischecked);
 		} break;
+
 		case RUN_DEPLOY_DUMB_CLIENTS: {
 
-			bool ischecked = fileserver_menu->get_popup()->is_item_checked( fileserver_menu->get_popup()->get_item_index(RUN_DEPLOY_DUMB_CLIENTS));
-			fileserver_menu->get_popup()->set_item_checked( fileserver_menu->get_popup()->get_item_index(RUN_DEPLOY_DUMB_CLIENTS),!ischecked);
+			bool ischecked = debug_button->get_popup()->is_item_checked( debug_button->get_popup()->get_item_index(RUN_DEPLOY_DUMB_CLIENTS));
+			debug_button->get_popup()->set_item_checked( debug_button->get_popup()->get_item_index(RUN_DEPLOY_DUMB_CLIENTS),!ischecked);
 			run_native->set_deploy_dumb(!ischecked);
 
 		} break;
+		case RUN_DEPLOY_REMOTE_DEBUG: {
+
+			bool ischecked = debug_button->get_popup()->is_item_checked( debug_button->get_popup()->get_item_index(RUN_DEPLOY_REMOTE_DEBUG));
+			debug_button->get_popup()->set_item_checked( debug_button->get_popup()->get_item_index(RUN_DEPLOY_REMOTE_DEBUG),!ischecked);
+			run_native->set_deploy_debug_remote(!ischecked);
+
+		} break;
+		case RUN_DEBUG_COLLISONS: {
+
+			bool ischecked = debug_button->get_popup()->is_item_checked( debug_button->get_popup()->get_item_index(RUN_DEBUG_COLLISONS));
+			debug_button->get_popup()->set_item_checked( debug_button->get_popup()->get_item_index(RUN_DEBUG_COLLISONS),!ischecked);
+			run_native->set_debug_collisions(!ischecked);
+			editor_run.set_debug_collisions(!ischecked);
+		} break;
+		case RUN_DEBUG_NAVIGATION: {
+
+			bool ischecked = debug_button->get_popup()->is_item_checked( debug_button->get_popup()->get_item_index(RUN_DEBUG_NAVIGATION));
+			debug_button->get_popup()->set_item_checked( debug_button->get_popup()->get_item_index(RUN_DEBUG_NAVIGATION),!ischecked);
+			run_native->set_debug_navigation(!ischecked);
+			editor_run.set_debug_navigation(!ischecked);
+		} break;
 		case SETTINGS_UPDATE_ALWAYS: {
 
 			update_menu->get_popup()->set_item_checked(0,true);
@@ -2665,6 +2946,20 @@ void EditorNode::_remove_edited_scene() {
 		unsaved_cache=false;
 	}
 }
+
+void EditorNode::_remove_scene(int index) {
+//	printf("Attempting to remove scene %d (current is %d)\n", index, editor_data.get_edited_scene());
+	if (editor_data.get_edited_scene() == index) {
+		//Scene to remove is current scene
+		_remove_edited_scene();
+	}
+	else {
+		// Scene to remove is not active scene.");
+		editor_data.remove_scene(index);
+		editor_data.get_undo_redo().clear_history();
+	}
+}
+
 void EditorNode::set_edited_scene(Node *p_scene) {
 
 	if (get_editor_data().get_edited_scene_root()) {
@@ -3018,11 +3313,26 @@ void EditorNode::set_current_scene(int p_idx) {
 	call_deferred("_set_main_scene_state",state); //do after everything else is done setting up
 	//print_line("set current 6 ");
 	changing_scene=false;
+	ScriptEditor::get_singleton()->get_debugger()->update_live_edit_root();
 
 
 }
 
-Error EditorNode::load_scene(const String& p_scene) {
+bool EditorNode::is_scene_open(const String& p_path) {
+
+	for(int i=0;i<editor_data.get_edited_scene_count();i++) {
+		if (editor_data.get_scene_path(i)==p_path)
+			return true;
+	}
+
+	return false;
+}
+
+void EditorNode::fix_dependencies(const String& p_for_file) {
+	dependency_fixer->edit(p_for_file);
+}
+
+Error EditorNode::load_scene(const String& p_scene, bool p_ignore_broken_deps,bool p_set_inherited) {
 
 	if (!is_inside_tree()) {
 		defer_load_scene = p_scene;
@@ -3068,6 +3378,8 @@ Error EditorNode::load_scene(const String& p_scene) {
 
 	//_cleanup_scene(); // i'm sorry but this MUST happen to avoid modified resources to not be reloaded.
 
+	dependency_errors.clear();
+
 	Ref<PackedScene> sdata = ResourceLoader::load(lpath,"",true);
 	if (!sdata.is_valid()) {
 
@@ -3085,6 +3397,35 @@ Error EditorNode::load_scene(const String& p_scene) {
 		return ERR_FILE_NOT_FOUND;
 	}
 
+	if (!p_ignore_broken_deps && dependency_errors.has(lpath)) {
+
+		current_option=-1;
+		Vector<String> errors;
+		for(Set<String>::Element *E=dependency_errors[lpath].front();E;E=E->next()) {
+
+			errors.push_back(E->get());
+		}
+		dependency_error->show(lpath,errors);
+		opening_prev=false;
+
+		if (prev!=-1) {
+			set_current_scene(prev);
+			editor_data.remove_scene(idx);
+		}
+		return ERR_FILE_MISSING_DEPENDENCIES;
+	}
+
+	dependency_errors.erase(lpath); //at least not self path
+
+	for (Map<String,Set<String> >::Element *E=dependency_errors.front();E;E=E->next()) {
+
+		String txt="Scene '"+E->key()+"' has broken dependencies:\n";
+		for(Set<String>::Element *F=E->get().front();F;F=F->next()) {
+			txt+="\t"+F->get()+"\n";
+		}
+		add_io_error(txt);
+	}
+
 	sdata->set_path(lpath,true); //take over path
 
 	Node*new_scene=sdata->instance(true);
@@ -3121,6 +3462,16 @@ Error EditorNode::load_scene(const String& p_scene) {
 	}
 */
 
+	if (p_set_inherited) {
+		Ref<SceneState> state = sdata->get_state();
+		state->set_path(lpath);
+		new_scene->set_scene_inherited_state(state);
+		new_scene->set_filename(String());
+		if (new_scene->get_scene_instance_state().is_valid())
+			new_scene->get_scene_instance_state()->set_path(String());
+	}
+
+
 	set_edited_scene(new_scene);
 	_get_scene_metadata();
 	/*
@@ -3155,6 +3506,8 @@ Error EditorNode::load_scene(const String& p_scene) {
 	prev_scene->set_disabled(previous_scenes.size()==0);
 	opening_prev=false;
 
+	ScriptEditor::get_singleton()->get_debugger()->update_live_edit_root();
+
 	//top_pallete->set_current_tab(0); //always go to scene
 
 	push_item(new_scene);
@@ -3378,9 +3731,12 @@ void EditorNode::hide_animation_player_editors() {
 
 void EditorNode::_quick_opened(const String& p_resource) {
 
-	print_line("quick_opened");
-	if (quick_open->get_base_type()=="PackedScene") {
+	if (current_option==FILE_QUICK_OPEN_FILE) {
+		scenes_dock->open(p_resource);
+		return;
+	}
 
+	if (quick_open->get_base_type()=="PackedScene") {
 		open_request(p_resource);
 	} else {
 		load_resource(p_resource);
@@ -3565,6 +3921,8 @@ void EditorNode::_bind_methods() {
 	ObjectTypeDB::bind_method("_quick_opened",&EditorNode::_quick_opened);
 	ObjectTypeDB::bind_method("_quick_run",&EditorNode::_quick_run);
 
+	ObjectTypeDB::bind_method("_resource_created",&EditorNode::_resource_created);
+
 	ObjectTypeDB::bind_method("_import_action",&EditorNode::_import_action);
 	//ObjectTypeDB::bind_method("_import",&EditorNode::_import);
 //	ObjectTypeDB::bind_method("_import_conflicts_solved",&EditorNode::_import_conflicts_solved);
@@ -3590,10 +3948,13 @@ void EditorNode::_bind_methods() {
 	ObjectTypeDB::bind_method("set_current_scene",&EditorNode::set_current_scene);
 	ObjectTypeDB::bind_method("set_current_version",&EditorNode::set_current_version);
 	ObjectTypeDB::bind_method("_scene_tab_changed",&EditorNode::_scene_tab_changed);
+	ObjectTypeDB::bind_method("_scene_tab_closed",&EditorNode::_scene_tab_closed);
 	ObjectTypeDB::bind_method("_scene_tab_script_edited",&EditorNode::_scene_tab_script_edited);
 	ObjectTypeDB::bind_method("_set_main_scene_state",&EditorNode::_set_main_scene_state);
 	ObjectTypeDB::bind_method("_update_scene_tabs",&EditorNode::_update_scene_tabs);
 
+	ObjectTypeDB::bind_method("_prepare_history",&EditorNode::_prepare_history);
+	ObjectTypeDB::bind_method("_select_history",&EditorNode::_select_history);
 
 
 	ObjectTypeDB::bind_method(_MD("add_editor_import_plugin", "plugin"), &EditorNode::add_editor_import_plugin);
@@ -4042,6 +4403,12 @@ void EditorNode::_scene_tab_script_edited(int p_tab) {
 		edit_resource(script);
 }
 
+void EditorNode::_scene_tab_closed(int p_tab) {
+ 	_remove_scene(p_tab);
+	_update_scene_tabs();
+}
+
+
 void EditorNode::_scene_tab_changed(int p_tab) {
 
 
@@ -4074,6 +4441,19 @@ void EditorNode::_scene_tab_changed(int p_tab) {
 EditorNode::EditorNode() {
 
 	EditorHelp::generate_doc(); //before any editor classes are crated
+	SceneState::set_disable_placeholders(true);
+
+	InputDefault *id = Input::get_singleton()->cast_to<InputDefault>();
+
+	if (id) {
+
+		if (!OS::get_singleton()->has_touchscreen_ui_hint() && Input::get_singleton()) {
+			//only if no touchscreen ui hint, set emulation
+			id->set_emulate_touch(false); //just disable just in case
+		}
+		id->set_custom_mouse_cursor(RES());
+	}
+
 
 	singleton=this;
 	last_checked_version=0;
@@ -4090,6 +4470,7 @@ EditorNode::EditorNode() {
 	ResourceLoader::set_abort_on_missing_resources(false);
 	FileDialog::set_default_show_hidden_files(EditorSettings::get_singleton()->get("file_dialog/show_hidden_files"));
 	ResourceLoader::set_error_notify_func(this,_load_error_notify);
+	ResourceLoader::set_dependency_error_notify_func(this,_dependency_error_report);
 
 	ResourceLoader::set_timestamp_on_load(true);
 	ResourceSaver::set_timestamp_on_save(true);
@@ -4195,8 +4576,10 @@ EditorNode::EditorNode() {
 	scene_tabs=memnew( Tabs );
 	scene_tabs->add_tab("unsaved");
 	scene_tabs->set_tab_align(Tabs::ALIGN_CENTER);
+	scene_tabs->set_tab_close_display_policy(Tabs::SHOW_HOVER);
 	scene_tabs->connect("tab_changed",this,"_scene_tab_changed");
 	scene_tabs->connect("right_button_pressed",this,"_scene_tab_script_edited");
+	scene_tabs->connect("tab_close", this, "_scene_tab_closed");
 	top_dark_vb->add_child(scene_tabs);
 	//left
 	left_l_hsplit = memnew( HSplitContainer );
@@ -4333,6 +4716,7 @@ EditorNode::EditorNode() {
 
 	main_editor_tabs  = memnew( Tabs );
 	main_editor_tabs->connect("tab_changed",this,"_editor_select");
+	main_editor_tabs->set_tab_close_display_policy(Tabs::SHOW_NEVER);
 	HBoxContainer *srth = memnew( HBoxContainer );
 	srt->add_child( srth );
 	Control *tec = memnew( Control );
@@ -4451,6 +4835,7 @@ EditorNode::EditorNode() {
 	file_menu->set_tooltip("Operations with scene files.");
 	p=file_menu->get_popup();
 	p->add_item("New Scene",FILE_NEW_SCENE);
+	p->add_item("New Inherited Scene..",FILE_NEW_INHERITED_SCENE);
 	p->add_item("Open Scene..",FILE_OPEN_SCENE,KEY_MASK_CMD+KEY_O);
 	p->add_separator();
 	p->add_item("Save Scene",FILE_SAVE_SCENE,KEY_MASK_CMD+KEY_S);
@@ -4463,6 +4848,7 @@ EditorNode::EditorNode() {
 	p->add_separator();
 	p->add_item("Quick Open Scene..",FILE_QUICK_OPEN_SCENE,KEY_MASK_SHIFT+KEY_MASK_CMD+KEY_O);
 	p->add_item("Quick Open Script..",FILE_QUICK_OPEN_SCRIPT,KEY_MASK_ALT+KEY_MASK_CMD+KEY_O);
+	p->add_item("Quick Search File..",FILE_QUICK_OPEN_FILE,KEY_MASK_ALT+KEY_MASK_CMD+KEY_P);
 	p->add_separator();
 
 	PopupMenu *pm_export = memnew(PopupMenu );
@@ -4594,6 +4980,7 @@ EditorNode::EditorNode() {
 	menu_hb->add_child(native_play_button);
 	native_play_button->hide();
 	native_play_button->get_popup()->connect("item_pressed",this,"_run_in_device");
+	run_native->connect("native_run",this,"_menu_option",varray(RUN_PLAY_NATIVE));
 
 //	VSeparator *s1 = memnew( VSeparator );
 //	play_hb->add_child(s1);
@@ -4614,21 +5001,24 @@ EditorNode::EditorNode() {
 	play_custom_scene_button->connect("pressed", this,"_menu_option",make_binds(RUN_PLAY_CUSTOM_SCENE));
 	play_custom_scene_button->set_tooltip("Play custom scene ("+keycode_get_string(KEY_MASK_CMD|KEY_MASK_SHIFT|KEY_F5)+").");
 
-	fileserver_menu = memnew( MenuButton );
-	play_hb->add_child(fileserver_menu);
-	fileserver_menu->set_flat(true);
-	fileserver_menu->set_focus_mode(Control::FOCUS_NONE);
-	fileserver_menu->set_icon(gui_base->get_icon("FileServer","EditorIcons"));
-	//fileserver_menu->connect("pressed", this,"_menu_option",make_binds(RUN_PLAY_CUSTOM_SCENE));
-	fileserver_menu->set_tooltip("Serve the project filesystem to remote clients.");
-
-	p=fileserver_menu->get_popup();
-	p->add_check_item("Enable File Server",RUN_FILE_SERVER);
-	p->set_item_tooltip(p->get_item_index(RUN_FILE_SERVER),"Enable/Disable the File Server.");
+	debug_button = memnew( MenuButton );
+	debug_button->set_flat(true);
+	play_hb->add_child(debug_button);
+	//debug_button->set_toggle_mode(true);
+	debug_button->set_focus_mode(Control::FOCUS_NONE);
+	debug_button->set_icon(gui_base->get_icon("Remote","EditorIcons"));
+	//debug_button->connect("pressed", this,"_menu_option",make_binds(RUN_LIVE_DEBUG));
+	debug_button->set_tooltip("Debug Options");
+
+	p=debug_button->get_popup();
+	p->add_check_item("Live Editing",RUN_LIVE_DEBUG);
+	p->add_check_item("File Server",RUN_FILE_SERVER);
 	p->add_separator();
-	p->add_check_item("Deploy Dumb Clients",RUN_DEPLOY_DUMB_CLIENTS);
-	//p->set_item_checked( p->get_item_index(RUN_DEPLOY_DUMB_CLIENTS),true );
-	p->set_item_tooltip(p->get_item_index(RUN_DEPLOY_DUMB_CLIENTS),"Deploy dumb clients when the File Server is active.");
+	p->add_check_item("Deploy Remote Debug",RUN_DEPLOY_REMOTE_DEBUG);
+	p->add_check_item("Deploy File Server Clients",RUN_DEPLOY_DUMB_CLIENTS);
+	p->add_separator();
+	p->add_check_item("Visible Collision Shapes",RUN_DEBUG_COLLISONS);
+	p->add_check_item("Visible Navigation",RUN_DEBUG_NAVIGATION);
 	p->connect("item_pressed",this,"_menu_option");
 
 	/*
@@ -4704,13 +5094,14 @@ EditorNode::EditorNode() {
 	scene_tree_dock->set_name("Scene");
 	//top_pallete->add_child(scene_tree_dock);
 	dock_slot[DOCK_SLOT_LEFT_UR]->add_child(scene_tree_dock);
-
+#if 0
 	resources_dock = memnew( ResourcesDock(this) );
 	resources_dock->set_name("Resources");
 	//top_pallete->add_child(resources_dock);
 	dock_slot[DOCK_SLOT_RIGHT_BL]->add_child(resources_dock);
 	//top_pallete->set_v_size_flags(Control::SIZE_EXPAND_FILL);
-
+#endif
+	dock_slot[DOCK_SLOT_RIGHT_BL]->hide();
 	/*Control *editor_spacer = memnew( Control );
 	editor_spacer->set_custom_minimum_size(Size2(260,200));
 	editor_spacer->set_v_size_flags(Control::SIZE_EXPAND_FILL);
@@ -4735,27 +5126,40 @@ EditorNode::EditorNode() {
 	dock_slot[DOCK_SLOT_RIGHT_UL]->add_child(prop_editor_base);
 
 	HBoxContainer *prop_editor_hb = memnew( HBoxContainer );
-	prop_editor_base->add_child(prop_editor_hb);
-	editor_path = memnew( EditorPath(&editor_history) );
-	editor_path->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-	prop_editor_hb->add_child(editor_path);
 
-	property_editor = memnew( PropertyEditor );
-	property_editor->set_autoclear(true);
-	property_editor->set_show_categories(true);
-	property_editor->set_v_size_flags(Control::SIZE_EXPAND_FILL);
-	
-	property_editor->hide_top_label();
-
-	prop_editor_base->add_child( property_editor );
-	property_editor->set_undo_redo(&editor_data.get_undo_redo());
+	prop_editor_base->add_child(prop_editor_hb);
 
+	resource_new_button = memnew( ToolButton );
+	resource_new_button->set_tooltip("Create a new resource in memory and edit it");
+	resource_new_button->set_icon(gui_base->get_icon("New","EditorIcons"));
+	prop_editor_hb->add_child(resource_new_button);
+	resource_new_button->connect("pressed",this,"_menu_option",varray(RESOURCE_NEW));
+	resource_new_button->set_focus_mode(Control::FOCUS_NONE);
+
+	resource_load_button = memnew( ToolButton );
+	resource_load_button->set_tooltip("Load an existing resource from disk and edit it");
+	resource_load_button->set_icon(gui_base->get_icon("Load","EditorIcons"));
+	prop_editor_hb->add_child(resource_load_button);
+	resource_load_button->connect("pressed",this,"_menu_option",varray(RESOURCE_LOAD));
+	resource_load_button->set_focus_mode(Control::FOCUS_NONE);
+
+	resource_save_button = memnew( MenuButton );
+	resource_save_button->set_tooltip("Save the currently edited resource");
+	resource_save_button->set_icon(gui_base->get_icon("Save","EditorIcons"));
+	prop_editor_hb->add_child(resource_save_button);
+	resource_save_button->get_popup()->add_item("Save",RESOURCE_SAVE);
+	resource_save_button->get_popup()->add_item("Save As..",RESOURCE_SAVE_AS);
+	resource_save_button->get_popup()->connect("item_pressed",this,"_menu_option");
+	resource_save_button->set_focus_mode(Control::FOCUS_NONE);
+	resource_save_button->set_disabled(true);
+
+	prop_editor_hb->add_spacer();
 
-	
 	property_back = memnew( ToolButton );
 	property_back->set_icon( gui_base->get_icon("Back","EditorIcons") );
 	property_back->set_flat(true);
 	property_back->set_tooltip("Go to the previous edited object in history.");
+	property_back->set_disabled(true);
 
 	prop_editor_hb->add_child( property_back );
 
@@ -4763,14 +5167,48 @@ EditorNode::EditorNode() {
 	property_forward->set_icon( gui_base->get_icon("Forward","EditorIcons") );
 	property_forward->set_flat(true);
 	property_forward->set_tooltip("Go to the next edited object in history.");
+	property_forward->set_disabled(true);
 
 	prop_editor_hb->add_child( property_forward );
 
+
+	editor_history_menu = memnew( MenuButton );
+	editor_history_menu->set_icon( gui_base->get_icon("History","EditorIcons"));
+	prop_editor_hb->add_child(editor_history_menu);
+	editor_history_menu->connect("about_to_show",this,"_prepare_history");
+	editor_history_menu->get_popup()->connect("item_pressed",this,"_select_history");
+
+
+	prop_editor_hb = memnew( HBoxContainer ); //again...
+
+	prop_editor_base->add_child(prop_editor_hb);
+	editor_path = memnew( EditorPath(&editor_history) );
+	editor_path->set_h_size_flags(Control::SIZE_EXPAND_FILL);
+	prop_editor_hb->add_child(editor_path);
+
+
 	object_menu = memnew( MenuButton );
 	object_menu->set_icon(gui_base->get_icon("Tools","EditorIcons"));
 	prop_editor_hb->add_child( object_menu );
 	object_menu->set_tooltip("Object properties.");
 
+	create_dialog = memnew( CreateDialog );
+	gui_base->add_child(create_dialog);
+	create_dialog->set_base_type("Resource");
+	create_dialog->connect("create",this,"_resource_created");
+
+
+	property_editor = memnew( PropertyEditor );
+	property_editor->set_autoclear(true);
+	property_editor->set_show_categories(true);
+	property_editor->set_v_size_flags(Control::SIZE_EXPAND_FILL);
+	property_editor->set_use_doc_hints(true);
+
+	property_editor->hide_top_label();
+
+	prop_editor_base->add_child( property_editor );
+	property_editor->set_undo_redo(&editor_data.get_undo_redo());
+
 
 	scenes_dock = memnew( ScenesDock(this) );
 	scenes_dock->set_name("FileSystem");
@@ -4898,7 +5336,11 @@ EditorNode::EditorNode() {
 
 
 
+	dependency_error = memnew( DependencyErrorDialog );
+	gui_base->add_child(dependency_error);
 
+	dependency_fixer = memnew( DependencyEditor );
+	gui_base->add_child( dependency_fixer );
 	
 	settings_config_dialog = memnew( EditorSettingsDialog );
 	gui_base->add_child(settings_config_dialog);
@@ -5076,6 +5518,7 @@ EditorNode::EditorNode() {
 	add_editor_plugin( memnew( TileSetEditorPlugin(this) ) );
 	add_editor_plugin( memnew( TileMapEditorPlugin(this) ) );
 	add_editor_plugin( memnew( SpriteFramesEditorPlugin(this) ) );
+	add_editor_plugin( memnew( SpriteRegionEditorPlugin(this) ) );
 	add_editor_plugin( memnew( Particles2DEditorPlugin(this) ) );
 	add_editor_plugin( memnew( Path2DEditorPlugin(this) ) );
 	add_editor_plugin( memnew( PathEditorPlugin(this) ) );
diff --git a/tools/editor/editor_node.h b/tools/editor/editor_node.h
index 495f069b55..56e455c9c0 100644
--- a/tools/editor/editor_node.h
+++ b/tools/editor/editor_node.h
@@ -107,6 +107,7 @@ class EditorNode : public Node {
 	enum MenuOptions {
 	
 		FILE_NEW_SCENE,
+		FILE_NEW_INHERITED_SCENE,
 		FILE_OPEN_SCENE,
 		FILE_SAVE_SCENE,
 		FILE_SAVE_AS_SCENE,
@@ -123,6 +124,7 @@ class EditorNode : public Node {
 		FILE_OPEN_OLD_SCENE,
 		FILE_QUICK_OPEN_SCENE,
 		FILE_QUICK_OPEN_SCRIPT,
+		FILE_QUICK_OPEN_FILE,
 		FILE_RUN_SCRIPT,
 		FILE_OPEN_PREV,
 		FILE_CLOSE,
@@ -137,6 +139,7 @@ class EditorNode : public Node {
 		RESOURCE_SAVE_AS,
 		RESOURCE_UNREF,
 		RESOURCE_COPY,
+		RESOURCE_PASTE,
 		OBJECT_COPY_PARAMS,
 		OBJECT_PASTE_PARAMS,
 		OBJECT_UNIQUE_RESOURCES,
@@ -146,12 +149,17 @@ class EditorNode : public Node {
 		RUN_PAUSE,
 		RUN_STOP,
 		RUN_PLAY_SCENE,
+		RUN_PLAY_NATIVE,
 		RUN_PLAY_CUSTOM_SCENE,
 		RUN_SCENE_SETTINGS,
 		RUN_SETTINGS,
 		RUN_PROJECT_MANAGER,
 		RUN_FILE_SERVER,
 		RUN_DEPLOY_DUMB_CLIENTS,
+		RUN_LIVE_DEBUG,
+		RUN_DEBUG_COLLISONS,
+		RUN_DEBUG_NAVIGATION,
+		RUN_DEPLOY_REMOTE_DEBUG,
 		SETTINGS_UPDATE_ALWAYS,
 		SETTINGS_UPDATE_CHANGES,
 		SETTINGS_IMPORT,
@@ -239,8 +247,9 @@ class EditorNode : public Node {
 	ToolButton *animation_menu;
 	ToolButton *play_scene_button;
 	ToolButton *play_custom_scene_button;
+	MenuButton *debug_button;
 	TextureProgress *audio_vu;
-	MenuButton *fileserver_menu;
+	//MenuButton *fileserver_menu;
 
 	TextEdit *load_errors;
 	AcceptDialog *load_error_dialog;
@@ -252,11 +261,13 @@ class EditorNode : public Node {
 	Button *property_back;
 	Button *property_forward;
 	SceneTreeDock *scene_tree_dock;
-	ResourcesDock *resources_dock;
+	//ResourcesDock *resources_dock;
 	PropertyEditor *property_editor;
 	ScenesDock *scenes_dock;
 	EditorRunNative *run_native;
 
+	CreateDialog *create_dialog;
+
 	CallDialog *call_dialog;
 	ConfirmationDialog *confirmation;
 	ConfirmationDialog *import_confirmation;
@@ -294,6 +305,10 @@ class EditorNode : public Node {
 	HBoxContainer *animation_panel_hb;
 	VBoxContainer *animation_vb;
 	EditorPath *editor_path;
+	ToolButton *resource_new_button;
+	ToolButton *resource_load_button;
+	MenuButton *resource_save_button;
+	MenuButton *editor_history_menu;
 	AnimationKeyEditor *animation_editor;
 	EditorLog *log;
 	CenterContainer *tabs_center;
@@ -308,6 +323,9 @@ class EditorNode : public Node {
 	ProgressDialog *progress_dialog;
 	BackgroundProgress *progress_hb;
 
+	DependencyErrorDialog *dependency_error;
+	DependencyEditor *dependency_fixer;
+
 	TabContainer *dock_slot[DOCK_SLOT_MAX];
 	Rect2 dock_select_rect[DOCK_SLOT_MAX];
 	int dock_select_rect_over;
@@ -363,6 +381,7 @@ class EditorNode : public Node {
 	
 	int current_option;
 	//void _animation_visibility_toggle();
+	void _resource_created();
 	void _resource_selected(const RES& p_res,const String& p_property="");
 	void _menu_option(int p_option);
 	void _menu_confirm_current();
@@ -371,6 +390,9 @@ class EditorNode : public Node {
 	void _property_editor_forward();
 	void _property_editor_back();
 
+	void _select_history(int p_idx);
+	void _prepare_history();
+
 	
 	void _fs_changed();
 	void _sources_changed(bool p_exist);
@@ -439,6 +461,7 @@ class EditorNode : public Node {
 
 	void _cleanup_scene();
 	void _remove_edited_scene();
+	void _remove_scene(int index);
 	bool _find_and_save_resource(RES p_res,Map<RES,bool>& processed,int32_t flags);
 	bool _find_and_save_edited_subresources(Object *obj,Map<RES,bool>& processed,int32_t flags);
 	void _save_edited_subresources(Node* scene,Map<RES,bool>& processed,int32_t flags);
@@ -447,6 +470,16 @@ class EditorNode : public Node {
 	void _save_scene_with_preview(String p_file);
 
 
+	Map<String,Set<String> > dependency_errors;
+
+	static void _dependency_error_report(void *ud,const String& p_path,const String& p_dep,const String& p_type) {
+		EditorNode*en=(EditorNode*)ud;
+		if (!en->dependency_errors.has(p_path))
+			en->dependency_errors[p_path]=Set<String>();
+		en->dependency_errors[p_path].insert(p_dep+"::"+p_type);
+
+	}
+
 	struct ExportDefer {
 		String platform;
 		String path;
@@ -469,6 +502,7 @@ class EditorNode : public Node {
 	void _dock_split_dragged(int ofs);
 	void _dock_popup_exit();
 	void _scene_tab_changed(int p_tab);
+	void _scene_tab_closed(int p_tab);
 	void _scene_tab_script_edited(int p_tab);
 
 	Dictionary _get_main_scene_state();
@@ -499,6 +533,8 @@ public:
 	void edit_node(Node *p_node);
 	void edit_resource(const Ref<Resource>& p_resource);
 	void open_resource(const String& p_type="");
+
+	void save_resource_in_path(const Ref<Resource>& p_resource,const String& p_path);
 	void save_resource(const Ref<Resource>& p_resource);
 	void save_resource_as(const Ref<Resource>& p_resource);
 
@@ -530,10 +566,13 @@ public:
 	Viewport *get_scene_root() { return scene_root; } //root of the scene being edited
 	Error save_optimized_copy(const String& p_scene,const String& p_preset);
 
+	void fix_dependencies(const String& p_for_file);
 	void clear_scene() { _cleanup_scene(); }
-	Error load_scene(const String& p_scene);
+	Error load_scene(const String& p_scene, bool p_ignore_broken_deps=false, bool p_set_inherited=false);
 	Error load_resource(const String& p_scene);
 
+	bool is_scene_open(const String& p_path);
+
 	void set_current_version(uint64_t p_version);
 	void set_current_scene(int p_idx);
 
diff --git a/tools/editor/editor_path.cpp b/tools/editor/editor_path.cpp
index 86fd79d014..94e2efe346 100644
--- a/tools/editor/editor_path.cpp
+++ b/tools/editor/editor_path.cpp
@@ -73,7 +73,11 @@ void EditorPath::_notification(int p_what) {
 					if (obj->cast_to<Resource>()) {
 
 						Resource *r = obj->cast_to<Resource>();
-						name=r->get_name();
+						if (r->get_path().is_resource_file())
+							name=r->get_path().get_file();
+						else
+							name=r->get_name();
+
 						if (name=="")
 							name=r->get_type();
 					} else if (obj->cast_to<Node>()) {
diff --git a/tools/editor/editor_plugin.cpp b/tools/editor/editor_plugin.cpp
index 04c34d9a88..7417d707bb 100644
--- a/tools/editor/editor_plugin.cpp
+++ b/tools/editor/editor_plugin.cpp
@@ -74,6 +74,7 @@ void EditorPlugin::add_custom_control(CustomControlContainer p_location,Control
 		case CONTAINER_CANVAS_EDITOR_SIDE: {
 
 			CanvasItemEditor::get_singleton()->get_palette_split()->add_child(p_control);
+			CanvasItemEditor::get_singleton()->get_palette_split()->move_child(p_control,0);
 
 		} break;
 		case CONTAINER_CANVAS_EDITOR_BOTTOM: {
diff --git a/tools/editor/editor_run.cpp b/tools/editor/editor_run.cpp
index 77c5f419b1..b635cea84b 100644
--- a/tools/editor/editor_run.cpp
+++ b/tools/editor/editor_run.cpp
@@ -28,7 +28,7 @@
 /*************************************************************************/
 #include "editor_run.h"
 #include "globals.h"
-
+#include "editor_settings.h"
 
 EditorRun::Status EditorRun::get_status() const {
 
@@ -61,6 +61,77 @@ Error EditorRun::run(const String& p_scene,const String p_custom_args,const List
 		}
 	}
 
+	if (debug_collisions) {
+		args.push_back("-debugcol");
+	}
+
+	if (debug_navigation) {
+		args.push_back("-debugnav");
+	}
+
+	int screen = EditorSettings::get_singleton()->get("game_window_placement/screen");
+
+	if (screen==0) {
+		screen=OS::get_singleton()->get_current_screen();
+	} else {
+		screen--;
+	}
+
+	Rect2 screen_rect;
+	screen_rect.pos=OS::get_singleton()->get_screen_position(screen);
+	screen_rect.size=OS::get_singleton()->get_screen_size(screen);
+
+
+	Size2 desired_size;
+
+	desired_size.x=Globals::get_singleton()->get("display/width");
+	desired_size.y=Globals::get_singleton()->get("display/height");
+
+	Size2 test_size;
+	test_size.x=Globals::get_singleton()->get("display/test_width");
+	test_size.y=Globals::get_singleton()->get("display/test_height");
+	if (test_size.x>0 && test_size.y>0) {
+
+		desired_size=test_size;
+	}
+
+
+	int window_placement=EditorSettings::get_singleton()->get("game_window_placement/rect");
+
+	switch(window_placement) {
+		case 0: { // default
+
+			args.push_back("-p");
+			args.push_back(itos(screen_rect.pos.x)+"x"+itos(screen_rect.pos.y));
+		} break;
+		case 1: { // centered
+			Vector2 pos=screen_rect.pos+((screen_rect.size-desired_size)/2).floor();
+			args.push_back("-p");
+			args.push_back(itos(pos.x)+"x"+itos(pos.y));
+		} break;
+		case 2: { // custom pos
+			Vector2 pos = EditorSettings::get_singleton()->get("game_window_placement/rect_custom_position");
+			pos+=screen_rect.pos;
+			args.push_back("-p");
+			args.push_back(itos(pos.x)+"x"+itos(pos.y));
+		} break;
+		case 3: { // force maximized
+			Vector2 pos=screen_rect.pos;
+			args.push_back("-p");
+			args.push_back(itos(pos.x)+"x"+itos(pos.y));
+			args.push_back("-mx");
+
+		} break;
+		case 4: { // force fullscreen
+
+			Vector2 pos=screen_rect.pos;
+			args.push_back("-p");
+			args.push_back(itos(pos.x)+"x"+itos(pos.y));
+			args.push_back("-f");
+		} break;
+	}
+
+
 	if (p_breakpoints.size()) {
 
 		args.push_back("-bp");
@@ -105,7 +176,31 @@ void EditorRun::stop() {
 	status=STATUS_STOP;
 }
 
+void EditorRun::set_debug_collisions(bool p_debug) {
+
+	debug_collisions=p_debug;
+}
+
+bool EditorRun::get_debug_collisions() const{
+
+	return debug_collisions;
+}
+
+void EditorRun::set_debug_navigation(bool p_debug) {
+
+	debug_navigation=p_debug;
+}
+
+bool EditorRun::get_debug_navigation() const{
+
+	return debug_navigation;
+}
+
+
 EditorRun::EditorRun() {
 
 	status=STATUS_STOP;
+	debug_collisions=false;
+	debug_navigation=false;
+
 }
diff --git a/tools/editor/editor_run.h b/tools/editor/editor_run.h
index 5541cc84fa..e1b0b081c7 100644
--- a/tools/editor/editor_run.h
+++ b/tools/editor/editor_run.h
@@ -43,12 +43,22 @@ public:
 	OS::ProcessID pid;
 private:
 
+	bool debug_collisions;
+	bool debug_navigation;
 	Status status;
 public:
 
 	Status get_status() const;
 	Error run(const String& p_scene,const String p_custom_args,const List<String>& p_breakpoints,const String& p_edited_scene);
+	void run_native_notify() { status=STATUS_PLAY; }
 	void stop();
+
+	void set_debug_collisions(bool p_debug);
+	bool get_debug_collisions() const;
+
+	void set_debug_navigation(bool p_debug);
+	bool get_debug_navigation() const;
+
 	EditorRun();
 };
 
diff --git a/tools/editor/editor_run_native.cpp b/tools/editor/editor_run_native.cpp
index 83b1753ea2..2eedba93dc 100644
--- a/tools/editor/editor_run_native.cpp
+++ b/tools/editor/editor_run_native.cpp
@@ -101,12 +101,28 @@ void EditorRunNative::_run_native(int p_idx,const String& p_platform) {
 
 	Ref<EditorExportPlatform> eep = EditorImportExport::get_singleton()->get_export_platform(p_platform);
 	ERR_FAIL_COND(eep.is_null());
-	eep->run(p_idx,deploy_dumb);
+	if (deploy_debug_remote) {
+		emit_signal("native_run");
+
+	}
+	int flags=0;
+	if (deploy_debug_remote)
+		flags|=EditorExportPlatform::EXPORT_REMOTE_DEBUG;
+	if (deploy_dumb)
+		flags|=EditorExportPlatform::EXPORT_DUMB_CLIENT;
+	if (debug_collisions)
+		flags|=EditorExportPlatform::EXPORT_VIEW_COLLISONS;
+	if (debug_navigation)
+		flags|=EditorExportPlatform::EXPORT_VIEW_NAVIGATION;
+
+	eep->run(p_idx,flags);
 }
 
 void EditorRunNative::_bind_methods() {
 
 	ObjectTypeDB::bind_method("_run_native",&EditorRunNative::_run_native);
+
+	ADD_SIGNAL(MethodInfo("native_run"));
 }
 
 void EditorRunNative::set_deploy_dumb(bool p_enabled) {
@@ -119,10 +135,43 @@ bool EditorRunNative::is_deploy_dumb_enabled() const{
 	return deploy_dumb;
 }
 
+void EditorRunNative::set_deploy_debug_remote(bool p_enabled) {
+
+	deploy_debug_remote=p_enabled;
+}
+
+bool EditorRunNative::is_deploy_debug_remote_enabled() const{
+
+	return deploy_debug_remote;
+}
+
+void EditorRunNative::set_debug_collisions(bool p_debug) {
+
+	debug_collisions=p_debug;
+}
+
+bool EditorRunNative::get_debug_collisions() const{
+
+	return debug_collisions;
+}
+
+void EditorRunNative::set_debug_navigation(bool p_debug) {
+
+	debug_navigation=p_debug;
+}
+
+bool EditorRunNative::get_debug_navigation() const{
+
+	return debug_navigation;
+}
 
 EditorRunNative::EditorRunNative()
 {
 	set_process(true);
 	first=true;
 	deploy_dumb=false;
+	deploy_debug_remote=false;
+	debug_collisions=false;
+	debug_navigation=false;
+
 }
diff --git a/tools/editor/editor_run_native.h b/tools/editor/editor_run_native.h
index 1512dc5dd9..77d6dc198e 100644
--- a/tools/editor/editor_run_native.h
+++ b/tools/editor/editor_run_native.h
@@ -39,6 +39,9 @@ class EditorRunNative : public HBoxContainer {
 	Map<StringName,MenuButton*> menus;
 	bool first;
 	bool deploy_dumb;
+	bool deploy_debug_remote;
+	bool debug_collisions;
+	bool debug_navigation;
 
 	void _run_native(int p_idx,const String& p_platform);
 
@@ -50,6 +53,16 @@ public:
 
 	void set_deploy_dumb(bool p_enabled);
 	bool is_deploy_dumb_enabled() const;
+
+	void set_deploy_debug_remote(bool p_enabled);
+	bool is_deploy_debug_remote_enabled() const;
+
+	void set_debug_collisions(bool p_debug);
+	bool get_debug_collisions() const;
+
+	void set_debug_navigation(bool p_debug);
+	bool get_debug_navigation() const;
+
 	EditorRunNative();
 };
 
diff --git a/tools/editor/editor_settings.cpp b/tools/editor/editor_settings.cpp
index 0df9fcadef..651b30c724 100644
--- a/tools/editor/editor_settings.cpp
+++ b/tools/editor/editor_settings.cpp
@@ -274,6 +274,7 @@ void EditorSettings::create() {
 			print_line("EditorSettings: Load OK!");
 		}
 
+		singleton->setup_network();
 		singleton->load_favorites();
 		singleton->scan_plugins();
 
@@ -289,6 +290,7 @@ void EditorSettings::create() {
 	singleton->config_file_path=config_file_path;
 	singleton->settings_path=config_path+"/"+config_dir;
 	singleton->_load_defaults();
+	singleton->setup_network();
 	singleton->scan_plugins();
 
 
@@ -330,6 +332,35 @@ Error EditorSettings::_load_plugin(const String& p_path, Plugin &plugin) {
 	return OK;
 }
 
+void EditorSettings::setup_network() {
+
+	List<IP_Address> local_ip;
+	IP::get_singleton()->get_local_addresses(&local_ip);
+	String lip;
+	String hint;
+	String current=get("network/debug_host");
+
+	for(List<IP_Address>::Element *E=local_ip.front();E;E=E->next()) {
+
+		String ip = E->get();
+		if (ip=="127.0.0.1")
+			continue;
+
+		if (lip!="")
+			lip=ip;
+		if (ip==current)
+			lip=current; //so it saves
+		if (hint!="")
+			hint+=",";
+		hint+=ip;
+
+	}
+
+	set("network/debug_host",lip);
+	add_property_hint(PropertyInfo(Variant::STRING,"network/debug_host",PROPERTY_HINT_ENUM,hint));
+
+}
+
 void EditorSettings::scan_plugins() {
 
 	Map<String,Plugin> new_plugins;
@@ -443,6 +474,7 @@ void EditorSettings::_load_defaults() {
 	set("scenetree_editor/duplicate_node_name_num_separator",0);
 	hints["scenetree_editor/duplicate_node_name_num_separator"]=PropertyInfo(Variant::INT,"scenetree_editor/duplicate_node_name_num_separator",PROPERTY_HINT_ENUM, "None,Space,Underscore,Dash");
 
+	set("gridmap_editor/pick_distance", 5000.0);
 
 	set("3d_editor/default_fov",45.0);
 	set("3d_editor/default_z_near",0.1);
@@ -465,6 +497,16 @@ void EditorSettings::_load_defaults() {
 	set("2d_editor/bone_selected_color",Color(0.9,0.45,0.45,0.9));
 	set("2d_editor/bone_ik_color",Color(0.9,0.9,0.45,0.9));
 
+	set("game_window_placement/rect",0);
+	hints["game_window_placement/rect"]=PropertyInfo(Variant::INT,"game_window_placement/rect",PROPERTY_HINT_ENUM,"Default,Centered,Custom Position,Force Maximized,Force Full Screen");
+	String screen_hints="Default (Same as Editor)";
+	for(int i=0;i<OS::get_singleton()->get_screen_count();i++) {
+		screen_hints+=",Monitor "+itos(i+1);
+	}
+	set("game_window_placement/rect_custom_position",Vector2());
+	set("game_window_placement/screen",0);
+	hints["game_window_placement/screen"]=PropertyInfo(Variant::INT,"game_window_placement/screen",PROPERTY_HINT_ENUM,screen_hints);
+
 	set("on_save/compress_binary_resources",true);
 	set("on_save/save_modified_external_resources",true);
 	set("on_save/save_paths_as_relative",false);
diff --git a/tools/editor/editor_settings.h b/tools/editor/editor_settings.h
index 6b7e6eb989..4ba940cd1c 100644
--- a/tools/editor/editor_settings.h
+++ b/tools/editor/editor_settings.h
@@ -113,6 +113,7 @@ public:
 
 	void scan_plugins();
 	void enable_plugins();
+	void setup_network();
 
 	void raise_order(const String& p_name);
 	static void create();
diff --git a/tools/editor/fileserver/editor_file_server.cpp b/tools/editor/fileserver/editor_file_server.cpp
index b66a1d522b..ea95e4da1c 100644
--- a/tools/editor/fileserver/editor_file_server.cpp
+++ b/tools/editor/fileserver/editor_file_server.cpp
@@ -318,27 +318,7 @@ EditorFileServer::EditorFileServer() {
 	cmd=CMD_NONE;
 	thread=Thread::create(_thread_start,this);
 
-	List<IP_Address> local_ip;
-	IP::get_singleton()->get_local_addresses(&local_ip);
 	EDITOR_DEF("file_server/port",6010);
-	String lip;
-	String hint;
-	for(List<IP_Address>::Element *E=local_ip.front();E;E=E->next()) {
-
-		String ip = E->get();
-		if (ip=="127.0.0.1")
-			continue;
-
-		if (lip!="")
-			lip=ip;
-		if (hint!="")
-			hint+=",";
-		hint+=ip;
-
-	}
-
-	EDITOR_DEF("file_server/host",lip);
-	EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING,"file_server/host",PROPERTY_HINT_ENUM,hint));
 	EDITOR_DEF("file_server/password","");
 }
 
diff --git a/tools/editor/icons/icon_anchor.png b/tools/editor/icons/icon_anchor.png
new file mode 100644
index 0000000000..1f9f9fa139
--- /dev/null
+++ b/tools/editor/icons/icon_anchor.png
diff --git a/tools/editor/icons/icon_audio_stream_opus.png b/tools/editor/icons/icon_audio_stream_opus.png
new file mode 100644
index 0000000000..69b0c83b4d
--- /dev/null
+++ b/tools/editor/icons/icon_audio_stream_opus.png
diff --git a/tools/editor/icons/icon_control_align_bottom_center.png b/tools/editor/icons/icon_control_align_bottom_center.png
new file mode 100644
index 0000000000..5ce9fe5c1c
--- /dev/null
+++ b/tools/editor/icons/icon_control_align_bottom_center.png
diff --git a/tools/editor/icons/icon_control_align_bottom_left.png b/tools/editor/icons/icon_control_align_bottom_left.png
new file mode 100644
index 0000000000..6c5129bf95
--- /dev/null
+++ b/tools/editor/icons/icon_control_align_bottom_left.png
diff --git a/tools/editor/icons/icon_control_align_bottom_right.png b/tools/editor/icons/icon_control_align_bottom_right.png
new file mode 100644
index 0000000000..8857f4e940
--- /dev/null
+++ b/tools/editor/icons/icon_control_align_bottom_right.png
diff --git a/tools/editor/icons/icon_control_align_bottom_wide.png b/tools/editor/icons/icon_control_align_bottom_wide.png
new file mode 100644
index 0000000000..56f009b8e4
--- /dev/null
+++ b/tools/editor/icons/icon_control_align_bottom_wide.png
diff --git a/tools/editor/icons/icon_control_align_center.png b/tools/editor/icons/icon_control_align_center.png
new file mode 100644
index 0000000000..acd42525fa
--- /dev/null
+++ b/tools/editor/icons/icon_control_align_center.png
diff --git a/tools/editor/icons/icon_control_align_center_left.png b/tools/editor/icons/icon_control_align_center_left.png
new file mode 100644
index 0000000000..997074b097
--- /dev/null
+++ b/tools/editor/icons/icon_control_align_center_left.png
diff --git a/tools/editor/icons/icon_control_align_center_right.png b/tools/editor/icons/icon_control_align_center_right.png
new file mode 100644
index 0000000000..b5cae63f7a
--- /dev/null
+++ b/tools/editor/icons/icon_control_align_center_right.png
diff --git a/tools/editor/icons/icon_control_align_left_center.png b/tools/editor/icons/icon_control_align_left_center.png
new file mode 100644
index 0000000000..7bb4dfb567
--- /dev/null
+++ b/tools/editor/icons/icon_control_align_left_center.png
diff --git a/tools/editor/icons/icon_control_align_left_wide.png b/tools/editor/icons/icon_control_align_left_wide.png
new file mode 100644
index 0000000000..1b0a6cff95
--- /dev/null
+++ b/tools/editor/icons/icon_control_align_left_wide.png
diff --git a/tools/editor/icons/icon_control_align_right_center.png b/tools/editor/icons/icon_control_align_right_center.png
new file mode 100644
index 0000000000..cf12d44c6a
--- /dev/null
+++ b/tools/editor/icons/icon_control_align_right_center.png
diff --git a/tools/editor/icons/icon_control_align_right_wide.png b/tools/editor/icons/icon_control_align_right_wide.png
new file mode 100644
index 0000000000..406ed25aed
--- /dev/null
+++ b/tools/editor/icons/icon_control_align_right_wide.png
diff --git a/tools/editor/icons/icon_control_align_top_center.png b/tools/editor/icons/icon_control_align_top_center.png
new file mode 100644
index 0000000000..da7ede984a
--- /dev/null
+++ b/tools/editor/icons/icon_control_align_top_center.png
diff --git a/tools/editor/icons/icon_control_align_top_left.png b/tools/editor/icons/icon_control_align_top_left.png
new file mode 100644
index 0000000000..84a224fbbe
--- /dev/null
+++ b/tools/editor/icons/icon_control_align_top_left.png
diff --git a/tools/editor/icons/icon_control_align_top_right.png b/tools/editor/icons/icon_control_align_top_right.png
new file mode 100644
index 0000000000..3b58eead9c
--- /dev/null
+++ b/tools/editor/icons/icon_control_align_top_right.png
diff --git a/tools/editor/icons/icon_control_align_top_wide.png b/tools/editor/icons/icon_control_align_top_wide.png
new file mode 100644
index 0000000000..869ae26134
--- /dev/null
+++ b/tools/editor/icons/icon_control_align_top_wide.png
diff --git a/tools/editor/icons/icon_control_align_wide.png b/tools/editor/icons/icon_control_align_wide.png
new file mode 100644
index 0000000000..57a2933b25
--- /dev/null
+++ b/tools/editor/icons/icon_control_align_wide.png
diff --git a/tools/editor/icons/icon_control_hcenter_wide.png b/tools/editor/icons/icon_control_hcenter_wide.png
new file mode 100644
index 0000000000..739ea5baeb
--- /dev/null
+++ b/tools/editor/icons/icon_control_hcenter_wide.png
diff --git a/tools/editor/icons/icon_control_vcenter_wide.png b/tools/editor/icons/icon_control_vcenter_wide.png
new file mode 100644
index 0000000000..44cbb8f344
--- /dev/null
+++ b/tools/editor/icons/icon_control_vcenter_wide.png
diff --git a/tools/editor/icons/icon_debug.png b/tools/editor/icons/icon_debug.png
new file mode 100644
index 0000000000..03b98aa9e4
--- /dev/null
+++ b/tools/editor/icons/icon_debug.png
diff --git a/tools/editor/icons/icon_file_list.png b/tools/editor/icons/icon_file_list.png
index e5e9213e61..ab790a85a5 100644
--- a/tools/editor/icons/icon_file_list.png
+++ b/tools/editor/icons/icon_file_list.png
diff --git a/tools/editor/icons/icon_filesystem.png b/tools/editor/icons/icon_filesystem.png
new file mode 100644
index 0000000000..6841f9a792
--- /dev/null
+++ b/tools/editor/icons/icon_filesystem.png
diff --git a/tools/editor/icons/icon_grid.png b/tools/editor/icons/icon_grid.png
new file mode 100644
index 0000000000..dcdd86c9b5
--- /dev/null
+++ b/tools/editor/icons/icon_grid.png
diff --git a/tools/editor/icons/icon_history.png b/tools/editor/icons/icon_history.png
new file mode 100644
index 0000000000..5c306c3ac9
--- /dev/null
+++ b/tools/editor/icons/icon_history.png
diff --git a/tools/editor/icons/icon_live_debug.png b/tools/editor/icons/icon_live_debug.png
new file mode 100644
index 0000000000..ad55646b9a
--- /dev/null
+++ b/tools/editor/icons/icon_live_debug.png
diff --git a/tools/editor/icons/icon_multi_node_edit.png b/tools/editor/icons/icon_multi_node_edit.png
new file mode 100644
index 0000000000..357c062cbd
--- /dev/null
+++ b/tools/editor/icons/icon_multi_node_edit.png
diff --git a/tools/editor/icons/icon_non_favorite.png b/tools/editor/icons/icon_non_favorite.png
new file mode 100644
index 0000000000..edd806fbe8
--- /dev/null
+++ b/tools/editor/icons/icon_non_favorite.png
diff --git a/tools/editor/icons/icon_patch_9_frame.png b/tools/editor/icons/icon_patch_9_frame.png
new file mode 100644
index 0000000000..c8f38fa61a
--- /dev/null
+++ b/tools/editor/icons/icon_patch_9_frame.png
diff --git a/tools/editor/icons/icon_region_edit.png b/tools/editor/icons/icon_region_edit.png
new file mode 100644
index 0000000000..824607f2cc
--- /dev/null
+++ b/tools/editor/icons/icon_region_edit.png
diff --git a/tools/editor/icons/icon_remote.png b/tools/editor/icons/icon_remote.png
new file mode 100644
index 0000000000..792d958a46
--- /dev/null
+++ b/tools/editor/icons/icon_remote.png
diff --git a/tools/editor/inspector_dock.cpp b/tools/editor/inspector_dock.cpp
new file mode 100644
index 0000000000..57d19c3ec8
--- /dev/null
+++ b/tools/editor/inspector_dock.cpp
@@ -0,0 +1,22 @@
+#include "inspector_dock.h"
+
+#if 0
+void InspectorDock::_go_next() {
+
+
+}
+
+void InspectorDock::_go_prev() {
+
+
+}
+
+void InspectorDock::_bind_methods() {
+
+}
+
+InspectorDock::InspectorDock() {
+
+
+}
+#endif
diff --git a/tools/editor/inspector_dock.h b/tools/editor/inspector_dock.h
new file mode 100644
index 0000000000..90f043aba8
--- /dev/null
+++ b/tools/editor/inspector_dock.h
@@ -0,0 +1,35 @@
+#ifndef INSPECTOR_DOCK_H
+#define INSPECTOR_DOCK_H
+
+#include "scene/gui/box_container.h"
+#include "property_editor.h"
+
+
+//this is for now bundled in EditorNode, will be moved away here eventually
+
+#if 0
+class InspectorDock : public VBoxContainer
+{
+	OBJ_TYPE(InspectorDock,VBoxContainer);
+
+	PropertyEditor *property_editor;
+
+	EditorHistory editor_history;
+
+	void _go_next();
+	void _go_prev();
+
+protected:
+
+	static void _bind_methods();
+public:
+
+	EditorHistory &get_editor_history();
+
+	PropertyEditor *get_property_editor();
+
+	InspectorDock();
+};
+
+#endif
+#endif // INSPECTOR_DOCK_H
diff --git a/tools/editor/io_plugins/editor_import_collada.cpp b/tools/editor/io_plugins/editor_import_collada.cpp
index d510333a32..d57cff850e 100644
--- a/tools/editor/io_plugins/editor_import_collada.cpp
+++ b/tools/editor/io_plugins/editor_import_collada.cpp
@@ -710,10 +710,126 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize,Ref<Mesh>& p_mesh,con
 
 		//find largest source..
 
+		/************************/
+		/* ADD WEIGHTS IF EXIST */
+		/************************/
+
+		Map<int,Vector<Collada::Vertex::Weight> > pre_weights;
+
+		bool has_weights=false;
+
+		if (skin_controller) {
+
+			const Collada::SkinControllerData::Source *weight_src=NULL;
+			int weight_ofs=0;
+
+			if (skin_controller->weights.sources.has("WEIGHT")) {
+
+				String weight_id = skin_controller->weights.sources["WEIGHT"].source;
+				weight_ofs = skin_controller->weights.sources["WEIGHT"].offset;
+				if (skin_controller->sources.has(weight_id)) {
+
+					weight_src = &skin_controller->sources[weight_id];
+
+				}
+			}
+
+			int joint_ofs=0;
+
+			if (skin_controller->weights.sources.has("JOINT")) {
+
+				joint_ofs = skin_controller->weights.sources["JOINT"].offset;
+			}
+
+			//should be OK, given this was pre-checked.
+
+			int index_ofs=0;
+			int wstride = skin_controller->weights.sources.size();
+			for(int w_i=0;w_i<skin_controller->weights.sets.size();w_i++) {
+
+				int amount = skin_controller->weights.sets[w_i];
+
+				Vector<Collada::Vertex::Weight> weights;
+
+				for (int a_i=0;a_i<amount;a_i++) {
+
+					Collada::Vertex::Weight w;
+
+					int read_from = index_ofs+a_i*wstride;
+					ERR_FAIL_INDEX_V(read_from+wstride-1,skin_controller->weights.indices.size(),ERR_INVALID_DATA);
+					int weight_index = skin_controller->weights.indices[read_from+weight_ofs];
+					ERR_FAIL_INDEX_V(weight_index,weight_src->array.size(),ERR_INVALID_DATA);
+
+					w.weight = weight_src->array[weight_index];
+
+					int bone_index = skin_controller->weights.indices[read_from+joint_ofs];
+					if (bone_index==-1)
+						continue; //ignore this weight (refers to bind shape)
+					ERR_FAIL_INDEX_V(bone_index,bone_remap.size(),ERR_INVALID_DATA);
+
+					w.bone_idx=bone_remap[bone_index];
+
+
+					weights.push_back(w);
+				}
+
+				/* FIX WEIGHTS */
+
+
+
+				weights.sort();
+
+				if (weights.size()>4) {
+					//cap to 4 and make weights add up 1
+					weights.resize(4);
+
+				}
+
+				//make sure weights allways add up to 1
+				float total=0;
+				for(int i=0;i<weights.size();i++)
+					total+=weights[i].weight;
+				if (total)
+					for(int i=0;i<weights.size();i++)
+						weights[i].weight/=total;
+
+				if (weights.size()==0 || total==0) { //if nothing, add a weight to bone 0
+					//no weights assigned
+					Collada::Vertex::Weight w;
+					w.bone_idx=0;
+					w.weight=1.0;
+					weights.clear();
+					weights.push_back(w);
+
+				}
+
+				pre_weights[w_i]=weights;
+
+				/*
+				for(Set<int>::Element *E=vertex_map[w_i].front();E;E=E->next()) {
+
+					int dst = E->get();
+					ERR_EXPLAIN("invalid vertex index in array");
+					ERR_FAIL_INDEX_V(dst,vertex_array.size(),ERR_INVALID_DATA);
+					vertex_array[dst].weights=weights;
+
+				}*/
+
+
+
+
+				index_ofs+=wstride*amount;
+
+			}
+
+			//vertices need to be localized
+			has_weights=true;
+
+		}
 
 		Set<Collada::Vertex> vertex_set; //vertex set will be the vertices
 		List<int> indices_list; //indices will be the indices
-		Map<int,Set<int> > vertex_map; //map vertices (for setting skinning/morph)
+		//Map<int,Set<int> > vertex_map; //map vertices (for setting skinning/morph)
 
 		/**************************/
 		/* CREATE PRIMITIVE ARRAY */
@@ -753,11 +869,16 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize,Ref<Mesh>& p_mesh,con
 				if (!p_optimize)
 					vertex.uid=vertidx++;
 
+
+
 				int vertex_index=p.indices[src+vertex_ofs]; //used for index field (later used by controllers)
 				int vertex_pos = (vertex_src->stride?vertex_src->stride:3) * vertex_index;
 				ERR_FAIL_INDEX_V(vertex_pos,vertex_src->array.size(),ERR_INVALID_DATA);
 				vertex.vertex=Vector3(vertex_src->array[vertex_pos+0],vertex_src->array[vertex_pos+1],vertex_src->array[vertex_pos+2]);
 
+				if (pre_weights.has(vertex_index)) {
+					vertex.weights=pre_weights[vertex_index];
+				}
 
 				if (normal_src) {
 
@@ -836,9 +957,9 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize,Ref<Mesh>& p_mesh,con
 					vertex_set.insert(vertex);
 				}
 
-				if (!vertex_map.has(vertex_index))
+			/*	if (!vertex_map.has(vertex_index))
 					vertex_map[vertex_index]=Set<int>();
-				vertex_map[vertex_index].insert(index); //should be outside..
+				vertex_map[vertex_index].insert(index); //should be outside..*/
 				//build triangles if needed
 				if (j==0)
 					prev2[0]=index;
@@ -874,120 +995,10 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize,Ref<Mesh>& p_mesh,con
 			vertex_array[F->get().idx]=F->get();
 		}
 
-		/************************/
-		/* ADD WEIGHTS IF EXIST */
-		/************************/
-
-
-		bool has_weights=false;
-
-		if (skin_controller) {
-
-			const Collada::SkinControllerData::Source *weight_src=NULL;
-			int weight_ofs=0;
-
-			if (skin_controller->weights.sources.has("WEIGHT")) {
-
-				String weight_id = skin_controller->weights.sources["WEIGHT"].source;
-				weight_ofs = skin_controller->weights.sources["WEIGHT"].offset;
-				if (skin_controller->sources.has(weight_id)) {
-
-					weight_src = &skin_controller->sources[weight_id];
-
-				}
-			}
-
-			int joint_ofs=0;
-
-			if (skin_controller->weights.sources.has("JOINT")) {
-
-				joint_ofs = skin_controller->weights.sources["JOINT"].offset;
-			}
-
-			//should be OK, given this was pre-checked.
-
-			int index_ofs=0;
-			int wstride = skin_controller->weights.sources.size();
-			for(int w_i=0;w_i<skin_controller->weights.sets.size();w_i++) {
-
-				int amount = skin_controller->weights.sets[w_i];
-
-				if (vertex_map.has(w_i)) { //vertex may no longer be here, don't bother converting
 
-					Vector<Collada::Vertex::Weight> weights;
-
-					for (int a_i=0;a_i<amount;a_i++) {
-
-						Collada::Vertex::Weight w;
-
-						int read_from = index_ofs+a_i*wstride;
-						ERR_FAIL_INDEX_V(read_from+wstride-1,skin_controller->weights.indices.size(),ERR_INVALID_DATA);
-						int weight_index = skin_controller->weights.indices[read_from+weight_ofs];
-						ERR_FAIL_INDEX_V(weight_index,weight_src->array.size(),ERR_INVALID_DATA);
-
-						w.weight = weight_src->array[weight_index];
-
-						int bone_index = skin_controller->weights.indices[read_from+joint_ofs];
-						if (bone_index==-1)
-							continue; //ignore this weight (refers to bind shape)
-						ERR_FAIL_INDEX_V(bone_index,bone_remap.size(),ERR_INVALID_DATA);
-
-						w.bone_idx=bone_remap[bone_index];
-
-
-						weights.push_back(w);
-					}
-
-					/* FIX WEIGHTS */
-
-
-
-					weights.sort();
-
-					if (weights.size()>4) {
-						//cap to 4 and make weights add up 1
-						weights.resize(4);
-
-					}
-
-					//make sure weights allways add up to 1
-					float total=0;
-					for(int i=0;i<weights.size();i++)
-						total+=weights[i].weight;
-					if (total)
-						for(int i=0;i<weights.size();i++)
-							weights[i].weight/=total;
-
-					if (weights.size()==0 || total==0) { //if nothing, add a weight to bone 0
-						//no weights assigned
-						Collada::Vertex::Weight w;
-						w.bone_idx=0;
-						w.weight=1.0;
-						weights.clear();
-						weights.push_back(w);
-
-					}
-
-
-					for(Set<int>::Element *E=vertex_map[w_i].front();E;E=E->next()) {
-
-						int dst = E->get();
-						ERR_EXPLAIN("invalid vertex index in array");
-						ERR_FAIL_INDEX_V(dst,vertex_array.size(),ERR_INVALID_DATA);
-						vertex_array[dst].weights=weights;
-
-					}
-
-				} else {
-					//zzprint_line("no vertex found for index "+itos(w_i));
-				}
-
-				index_ofs+=wstride*amount;
-
-			}
-
-			//vertices need to be localized
+		if (has_weights) {
 
+			//if skeleton, localize
 			Transform local_xform = p_local_xform;
 			for(int i=0;i<vertex_array.size();i++) {
 
@@ -1000,11 +1011,9 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize,Ref<Mesh>& p_mesh,con
 					//vertex_array[i].tangent.normal*=-1.0;
 				}
 			}
-
-			has_weights=true;
-
 		}
 
+
 		DVector<int> index_array;
 		index_array.resize(indices_list.size());
 		DVector<int>::Write index_arrayw = index_array.write();
diff --git a/tools/editor/io_plugins/editor_sample_import_plugin.cpp b/tools/editor/io_plugins/editor_sample_import_plugin.cpp
index 9491f957c3..9298b35b3b 100644
--- a/tools/editor/io_plugins/editor_sample_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_sample_import_plugin.cpp
@@ -710,7 +710,7 @@ void EditorSampleImportPlugin::_compress_ima_adpcm(const Vector<float>& p_data,D
 	*(out++) =0;
 
 	for (i=0;i<datalen;i++) {
-		int step,diff,vpdiff,signed_nibble,p,mask;
+		int step,diff,vpdiff,mask;
 		uint8_t nibble;
 		int16_t xm_sample;
 
diff --git a/tools/editor/io_plugins/editor_texture_import_plugin.cpp b/tools/editor/io_plugins/editor_texture_import_plugin.cpp
index 4f7ec1839a..8d5a4f1dcf 100644
--- a/tools/editor/io_plugins/editor_texture_import_plugin.cpp
+++ b/tools/editor/io_plugins/editor_texture_import_plugin.cpp
@@ -828,7 +828,7 @@ Error EditorTextureImportPlugin::import(const String& p_path, const Ref<Resource
 }
 
 
-Error EditorTextureImportPlugin::_process_texture_data(Ref<ImageTexture> &texture,int format, float quality,int flags,EditorExportPlatform::ImageCompression p_compr,int tex_flags,int shrink)  {
+Error EditorTextureImportPlugin::_process_texture_data(Ref<ImageTexture> &texture,int format, float quality,int flags,EditorExportPlatform::ImageCompression p_compr,int tex_flags,float shrink)  {
 
 
 	if (format==IMAGE_FORMAT_COMPRESS_DISK_LOSSLESS || format==IMAGE_FORMAT_COMPRESS_DISK_LOSSY) {
@@ -866,7 +866,7 @@ Error EditorTextureImportPlugin::_process_texture_data(Ref<ImageTexture> &textur
 
 			int orig_w=image.get_width();
 			int orig_h=image.get_height();
-			image.resize(orig_w/shrink,orig_h/shrink);
+			image.resize(orig_w/shrink,orig_h/shrink,Image::INTERPOLATE_CUBIC);
 			texture->create_from_image(image,tex_flags);
 			texture->set_size_override(Size2(orig_w,orig_h));
 
@@ -926,7 +926,7 @@ Error EditorTextureImportPlugin::_process_texture_data(Ref<ImageTexture> &textur
 		int orig_h=image.get_height();
 
 		if (shrink>1) {
-			image.resize(orig_w/shrink,orig_h/shrink);
+			image.resize(orig_w/shrink,orig_h/shrink,Image::INTERPOLATE_CUBIC);
 			texture->create_from_image(image,tex_flags);
 			texture->set_size_override(Size2(orig_w,orig_h));
 		}
@@ -987,7 +987,7 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc
 		tex_flags|=Texture::FLAG_ANISOTROPIC_FILTER;
 
 	print_line("path: "+p_path+" flags: "+itos(tex_flags));
-	int shrink=1;
+	float shrink=1;
 	if (from->has_option("shrink"))
 		shrink=from->get_option("shrink");
 
@@ -1068,12 +1068,14 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc
 
 		//prepare atlas!
 		Vector< Image > sources;
+		Vector< Image > tsources;
 		bool alpha=false;
 		bool crop = from->get_option("crop");
 
 		EditorProgress ep("make_atlas","Build Atlas For: "+p_path.get_file(),from->get_source_count()+3);
 
 		print_line("sources: "+itos(from->get_source_count()));
+
 		for(int i=0;i<from->get_source_count();i++) {
 
 			String path = EditorImportPlugin::expand_source_path(from->get_source_path(i));
@@ -1091,17 +1093,57 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc
 			if (src.detect_alpha())
 				alpha=true;
 
-			sources.push_back(src);
+			tsources.push_back(src);
 		}
 		ep.step("Converting Images",sources.size());
 
-		for(int i=0;i<sources.size();i++) {
+		int base_index=0;
+
+
+		Map<uint64_t,int> source_md5;
+		Map<int,List<int> > source_map;
+
+		for(int i=0;i<tsources.size();i++) {
+
+			Image src = tsources[i];
 
 			if (alpha) {
-				sources[i].convert(Image::FORMAT_RGBA);
+				src.convert(Image::FORMAT_RGBA);
 			} else {
-				sources[i].convert(Image::FORMAT_RGB);
+				src.convert(Image::FORMAT_RGB);
+			}
+
+			DVector<uint8_t> data = src.get_data();
+			MD5_CTX md5;
+			DVector<uint8_t>::Read r=data.read();
+			MD5Init(&md5);
+			int len=data.size();
+			for(int j=0;j<len;j++) {
+				uint8_t b = r[j];
+				b>>=2; //to aid in comparing
+				MD5Update(&md5,(unsigned char*)&b,1);
+			}
+			MD5Final(&md5);
+			uint64_t *cmp = (uint64_t*)md5.digest; //less bits, but still useful for this
+
+			tsources[i]=Image(); //clear
+
+			if (source_md5.has(*cmp)) {
+				int sidx=source_md5[*cmp];
+				source_map[sidx].push_back(i);
+				print_line("REUSING "+from->get_source_path(i));
+
+			} else {
+				int sidx=sources.size();
+				source_md5[*cmp]=sidx;
+				sources.push_back(src);
+				List<int> sm;
+				sm.push_back(i);
+				source_map[sidx]=sm;
+
 			}
+
+
 		}
 
 		//texturepacker is not really good for optimizing, so..
@@ -1138,31 +1180,59 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc
 
 		ep.step("Blitting Images",sources.size()+2);
 
+		bool blit_to_po2=tex_flags&Texture::FLAG_MIPMAPS;
+		int atlas_w=dst_size.width;
+		int atlas_h=dst_size.height;
+		if (blit_to_po2) {
+			atlas_w=nearest_power_of_2(dst_size.width);
+			atlas_h=nearest_power_of_2(dst_size.height);
+		}
 		Image atlas;
-		atlas.create(nearest_power_of_2(dst_size.width),nearest_power_of_2(dst_size.height),0,alpha?Image::FORMAT_RGBA:Image::FORMAT_RGB);
+		atlas.create(atlas_w,atlas_h,0,alpha?Image::FORMAT_RGBA:Image::FORMAT_RGB);
+
+
+		atlases.resize(from->get_source_count());
 
 		for(int i=0;i<sources.size();i++) {
 
 			int x=dst_positions[i].x;
 			int y=dst_positions[i].y;
 
-			Ref<AtlasTexture> at = memnew( AtlasTexture );
 			Size2 sz = Size2(sources[i].get_width(),sources[i].get_height());
+
+			Rect2 region;
+			Rect2 margin;
+
 			if (crop && sz!=crops[i].size) {
 				Rect2 rect = crops[i];
 				rect.size=sz-rect.size;
-				at->set_region(Rect2(x+border,y+border,crops[i].size.width,crops[i].size.height));
-				at->set_margin(rect);
+				region=Rect2(x+border,y+border,crops[i].size.width,crops[i].size.height);
+				margin=rect;
 				atlas.blit_rect(sources[i],crops[i],Point2(x+border,y+border));
 			} else {
-				at->set_region(Rect2(x+border,y+border,sz.x,sz.y));
+				region=Rect2(x+border,y+border,sz.x,sz.y);
 				atlas.blit_rect(sources[i],Rect2(0,0,sources[i].get_width(),sources[i].get_height()),Point2(x+border,y+border));
 			}
-			String apath = p_path.get_base_dir().plus_file(from->get_source_path(i).get_file().basename()+".atex");
-			print_line("Atlas Tex: "+apath);
-			at->set_path(apath);
-			atlases.push_back(at);
 
+			ERR_CONTINUE( !source_map.has(i) );
+			for (List<int>::Element *E=source_map[i].front();E;E=E->next()) {
+
+				String apath = p_path.get_base_dir().plus_file(from->get_source_path(E->get()).get_file().basename()+".atex");
+
+				Ref<AtlasTexture> at;
+
+				if (ResourceCache::has(apath)) {
+					at = Ref<AtlasTexture>( ResourceCache::get(apath)->cast_to<AtlasTexture>() );
+				} else {
+
+					at = Ref<AtlasTexture>( memnew( AtlasTexture ) );
+				}
+				at->set_region(region);
+				at->set_margin(margin);
+				at->set_path(apath);
+				atlases[E->get()]=at;
+				print_line("Atlas Tex: "+apath);
+			}
 		}
 		if (ResourceCache::has(p_path)) {
 			texture = Ref<ImageTexture> ( ResourceCache::get(p_path)->cast_to<ImageTexture>() );
@@ -1414,6 +1484,9 @@ Vector<uint8_t> EditorTextureImportPlugin::custom_export(const String& p_path, c
 				case EditorImportExport::IMAGE_ACTION_COMPRESS_RAM: {
 					group_format=EditorTextureImportPlugin::IMAGE_FORMAT_COMPRESS_RAM;
 				} break; //use default
+				case EditorImportExport::IMAGE_ACTION_KEEP: {
+					return Vector<uint8_t>();
+				} break; //use default
 			}
 
 
diff --git a/tools/editor/io_plugins/editor_texture_import_plugin.h b/tools/editor/io_plugins/editor_texture_import_plugin.h
index 02d09d9e17..78383d1d77 100644
--- a/tools/editor/io_plugins/editor_texture_import_plugin.h
+++ b/tools/editor/io_plugins/editor_texture_import_plugin.h
@@ -70,7 +70,7 @@ private:
 	static EditorTextureImportPlugin *singleton[MODE_MAX];
 	//used by other importers such as mesh
 
-	Error _process_texture_data(Ref<ImageTexture> &texture, int format, float quality, int flags,EditorExportPlatform::ImageCompression p_compr,int tex_flags,int shrink);
+	Error _process_texture_data(Ref<ImageTexture> &texture, int format, float quality, int flags,EditorExportPlatform::ImageCompression p_compr,int tex_flags,float shrink);
 	void compress_image(EditorExportPlatform::ImageCompression p_mode,Image& image,bool p_smaller);
 public:
 
diff --git a/tools/editor/multi_node_edit.cpp b/tools/editor/multi_node_edit.cpp
new file mode 100644
index 0000000000..cfa998bee9
--- /dev/null
+++ b/tools/editor/multi_node_edit.cpp
@@ -0,0 +1,118 @@
+#include "multi_node_edit.h"
+#include "editor_node.h"
+
+bool MultiNodeEdit::_set(const StringName& p_name, const Variant& p_value){
+
+	Node *es = EditorNode::get_singleton()->get_edited_scene();
+	if (!es)
+		return false;
+
+	UndoRedo *ur=EditorNode::get_singleton()->get_undo_redo();
+
+	ur->create_action("MultiNode Set "+String(p_name));
+	for (const List<NodePath>::Element *E=nodes.front();E;E=E->next()) {
+
+		if (!es->has_node(E->get()))
+			continue;
+
+		Node*n=es->get_node(E->get());
+		if (!n)
+			continue;
+
+		ur->add_do_property(n,p_name,p_value);
+		ur->add_undo_property(n,p_name,n->get(p_name));
+
+	}
+
+	ur->commit_action();
+	return true;
+}
+
+bool MultiNodeEdit::_get(const StringName& p_name,Variant &r_ret) const {
+
+	Node *es = EditorNode::get_singleton()->get_edited_scene();
+	if (!es)
+		return false;
+
+	for (const List<NodePath>::Element *E=nodes.front();E;E=E->next()) {
+
+		if (!es->has_node(E->get()))
+			continue;
+
+		const Node*n=es->get_node(E->get());
+		if (!n)
+			continue;
+
+		bool found;
+		r_ret=n->get(p_name,&found);
+		if (found)
+			return true;
+
+	}
+
+	return false;
+}
+
+void MultiNodeEdit::_get_property_list( List<PropertyInfo> *p_list) const{
+
+	HashMap<String,PLData> usage;
+
+	Node *es = EditorNode::get_singleton()->get_edited_scene();
+	if (!es)
+		return;
+
+	int nc=0;
+
+	List<PLData*> datas;
+
+	for (const List<NodePath>::Element *E=nodes.front();E;E=E->next()) {
+
+		if (!es->has_node(E->get()))
+			continue;
+
+		Node*n=es->get_node(E->get());
+		if (!n)
+			continue;
+
+		List<PropertyInfo> plist;
+		n->get_property_list(&plist,true);
+
+		for(List<PropertyInfo>::Element *F=plist.front();F;F=F->next()) {
+
+			if (!usage.has(F->get().name)) {
+				PLData pld;
+				pld.uses=0;
+				pld.info=F->get();
+				usage[F->get().name]=pld;
+				datas.push_back(usage.getptr(F->get().name));
+			}
+
+			usage[F->get().name].uses++;
+		}
+
+		nc++;
+	}
+
+	for (List<PLData*>::Element *E=datas.front();E;E=E->next()) {
+
+		if (nc==E->get()->uses) {
+			p_list->push_back(E->get()->info);
+		}
+	}
+
+
+}
+
+void MultiNodeEdit::clear_nodes() {
+
+	nodes.clear();
+}
+
+void MultiNodeEdit::add_node(const NodePath& p_node){
+
+	nodes.push_back(p_node);
+}
+
+MultiNodeEdit::MultiNodeEdit()
+{
+}
diff --git a/tools/editor/multi_node_edit.h b/tools/editor/multi_node_edit.h
new file mode 100644
index 0000000000..5a0cabf4be
--- /dev/null
+++ b/tools/editor/multi_node_edit.h
@@ -0,0 +1,32 @@
+#ifndef MULTI_NODE_EDIT_H
+#define MULTI_NODE_EDIT_H
+
+#include "scene/main/node.h"
+
+class MultiNodeEdit : public Reference {
+
+	OBJ_TYPE(MultiNodeEdit,Reference);
+
+	List<NodePath> nodes;
+	struct PLData {
+		int uses;
+		PropertyInfo info;
+	};
+
+protected:
+
+	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 clear_nodes();
+	void add_node(const NodePath& p_node);
+
+	MultiNodeEdit();
+};
+
+#endif // MULTI_NODE_EDIT_H
diff --git a/tools/editor/plugins/animation_player_editor_plugin.cpp b/tools/editor/plugins/animation_player_editor_plugin.cpp
index 05b12543d2..f8c484e886 100644
--- a/tools/editor/plugins/animation_player_editor_plugin.cpp
+++ b/tools/editor/plugins/animation_player_editor_plugin.cpp
@@ -549,6 +549,49 @@ void AnimationPlayerEditor::ensure_visibility() {
 	_animation_edit();
 }
 
+Dictionary AnimationPlayerEditor::get_state() const {
+
+	Dictionary d;
+
+	d["visible"]=is_visible();
+	if (is_visible() && player) {
+		d["player"]=EditorNode::get_singleton()->get_edited_scene()->get_path_to(player);
+		d["animation"]=player->get_current_animation();
+		d["editing"]=edit_anim->is_pressed();
+	}
+
+	return d;
+
+}
+void AnimationPlayerEditor::set_state(const Dictionary& p_state) {
+
+	if (p_state.has("visible") && p_state["visible"]) {
+
+		Node *n = EditorNode::get_singleton()->get_edited_scene()->get_node(p_state["player"]);
+		if (n && n->cast_to<AnimationPlayer>()) {
+			player=n->cast_to<AnimationPlayer>();
+			_update_player();
+			show();
+			set_process(true);
+			ensure_visibility();
+			EditorNode::get_singleton()->animation_panel_make_visible(true);
+
+			if (p_state.has("animation")) {
+				String anim = p_state["animation"];
+				_select_anim_by_name(anim);
+				if (p_state.has("editing") && p_state["editing"]) {
+
+					edit_anim->set_pressed(true);
+					_animation_edit();
+				}
+			}
+
+		}
+	}
+
+}
+
+
 void AnimationPlayerEditor::_animation_resource_edit() {
 
 	if (animation->get_item_count()) {
@@ -1350,6 +1393,7 @@ AnimationPlayerEditorPlugin::AnimationPlayerEditorPlugin(EditorNode *p_node) {
 
 	editor=p_node;
 	anim_editor = memnew( AnimationPlayerEditor(editor) );
+	anim_editor->set_undo_redo(editor->get_undo_redo());
 	editor->get_animation_panel()->add_child(anim_editor);
 	/*
 	editor->get_viewport()->add_child(anim_editor);
diff --git a/tools/editor/plugins/animation_player_editor_plugin.h b/tools/editor/plugins/animation_player_editor_plugin.h
index 9f0413088d..5705742565 100644
--- a/tools/editor/plugins/animation_player_editor_plugin.h
+++ b/tools/editor/plugins/animation_player_editor_plugin.h
@@ -151,6 +151,10 @@ protected:
 	static void _bind_methods();
 public:
 
+	Dictionary get_state() const;
+	void set_state(const Dictionary& p_state);
+
+
 	void ensure_visibility();
 
 	void set_undo_redo(UndoRedo *p_undo_redo) { undo_redo=p_undo_redo; }
@@ -167,6 +171,9 @@ class AnimationPlayerEditorPlugin : public EditorPlugin {
 
 public:
 
+	virtual Dictionary get_state() const { return anim_editor->get_state(); }
+	virtual void set_state(const Dictionary& p_state)  { anim_editor->set_state(p_state); }
+
 	virtual String get_name() const { return "Anim"; }
 	bool has_main_screen() const { return false; }
 	virtual void edit(Object *p_node);
diff --git a/tools/editor/plugins/canvas_item_editor_plugin.cpp b/tools/editor/plugins/canvas_item_editor_plugin.cpp
index f2738f0a62..d318f6f6fa 100644
--- a/tools/editor/plugins/canvas_item_editor_plugin.cpp
+++ b/tools/editor/plugins/canvas_item_editor_plugin.cpp
@@ -144,6 +144,9 @@ void CanvasItemEditor::_unhandled_key_input(const InputEvent& p_ev) {
 
 	if (!is_visible())
 		return;
+	if (p_ev.key.mod.control)
+		// prevent to change tool mode when control key is pressed
+		return;
 	if (p_ev.key.pressed && !p_ev.key.echo && p_ev.key.scancode==KEY_Q)
 		_tool_select(TOOL_SELECT);
 	if (p_ev.key.pressed && !p_ev.key.echo && p_ev.key.scancode==KEY_W)
@@ -1281,7 +1284,7 @@ void CanvasItemEditor::_viewport_input_event(const InputEvent& p_event) {
 
 	if (p_event.type==InputEvent::MOUSE_MOTION) {
 
-		if (!viewport->has_focus())
+        if (!viewport->has_focus() && (!get_focus_owner() || !get_focus_owner()->is_text_field()))
 			viewport->call_deferred("grab_focus");
 
 		const InputEventMouseMotion &m=p_event.mouse_motion;
@@ -1910,12 +1913,20 @@ void CanvasItemEditor::_notification(int p_what) {
 
 		List<Node*> &selection = editor_selection->get_selected_node_list();
 
+		bool all_control=true;
+		bool has_control=false;
+
 		for(List<Node*>::Element *E=selection.front();E;E=E->next()) {
 
 			CanvasItem *canvas_item = E->get()->cast_to<CanvasItem>();
 			if (!canvas_item || !canvas_item->is_visible())
 				continue;
 
+			if (canvas_item->cast_to<Control>())
+				has_control=true;
+			else
+				all_control=false;
+
 			CanvasItemEditorSelectedItem *se=editor_selection->get_node_editor_data<CanvasItemEditorSelectedItem>(canvas_item);
 			if (!se)
 				continue;
@@ -1932,6 +1943,13 @@ void CanvasItemEditor::_notification(int p_what) {
 
 		}
 
+		bool show_anchor = all_control && has_control;
+		if (show_anchor != !anchor_menu->is_hidden()) {
+			if (show_anchor)
+				anchor_menu->show();
+			else
+				anchor_menu->hide();
+		}
 
 		for(Map<ObjectID,BoneList>::Element *E=bone_list.front();E;E=E->next()) {
 
@@ -1974,6 +1992,32 @@ void CanvasItemEditor::_notification(int p_what) {
 		ungroup_button->set_icon(get_icon("Ungroup","EditorIcons"));
 		key_insert_button->set_icon(get_icon("Key","EditorIcons"));
 
+
+		//anchor_menu->add_icon_override("Align Top Left");
+		anchor_menu->set_icon(get_icon("Anchor","EditorIcons"));
+		PopupMenu *p=anchor_menu->get_popup();
+
+		p->add_icon_item(get_icon("ControlAlignTopLeft","EditorIcons"),"Top Left",ANCHOR_ALIGN_TOP_LEFT);
+		p->add_icon_item(get_icon("ControlAlignTopRight","EditorIcons"),"Top Right",ANCHOR_ALIGN_TOP_RIGHT);
+		p->add_icon_item(get_icon("ControlAlignBottomRight","EditorIcons"),"Bottom Right",ANCHOR_ALIGN_BOTTOM_RIGHT);
+		p->add_icon_item(get_icon("ControlAlignBottomLeft","EditorIcons"),"Bottom Left",ANCHOR_ALIGN_BOTTOM_LEFT);
+		p->add_separator();
+		p->add_icon_item(get_icon("ControlAlignLeftCenter","EditorIcons"),"Center Left",ANCHOR_ALIGN_CENTER_LEFT);
+		p->add_icon_item(get_icon("ControlAlignTopCenter","EditorIcons"),"Center Top",ANCHOR_ALIGN_CENTER_TOP);
+		p->add_icon_item(get_icon("ControlAlignRightCenter","EditorIcons"),"Center Right",ANCHOR_ALIGN_CENTER_RIGHT);
+		p->add_icon_item(get_icon("ControlAlignBottomCenter","EditorIcons"),"Center Bottom",ANCHOR_ALIGN_CENTER_BOTTOM);
+		p->add_icon_item(get_icon("ControlAlignCenter","EditorIcons"),"Center",ANCHOR_ALIGN_CENTER);
+		p->add_separator();
+		p->add_icon_item(get_icon("ControlAlignLeftWide","EditorIcons"),"Left Wide",ANCHOR_ALIGN_LEFT_WIDE);
+		p->add_icon_item(get_icon("ControlAlignTopWide","EditorIcons"),"Top Wide",ANCHOR_ALIGN_TOP_WIDE);
+		p->add_icon_item(get_icon("ControlAlignRightWide","EditorIcons"),"Right Wide",ANCHOR_ALIGN_RIGHT_WIDE);
+		p->add_icon_item(get_icon("ControlAlignBottomWide","EditorIcons"),"Bottom Wide",ANCHOR_ALIGN_BOTTOM_WIDE);
+		p->add_icon_item(get_icon("ControlVcenterWide","EditorIcons"),"VCenter Wide ",ANCHOR_ALIGN_VCENTER_WIDE);
+		p->add_icon_item(get_icon("ControlHcenterWide","EditorIcons"),"HCenter Wide ",ANCHOR_ALIGN_HCENTER_WIDE);
+		p->add_separator();
+		p->add_icon_item(get_icon("ControlAlignWide","EditorIcons"),"Full Rect",ANCHOR_ALIGN_WIDE);
+
+
 	}
 
 	if (p_what==NOTIFICATION_READY) {
@@ -2179,6 +2223,27 @@ void CanvasItemEditor::_update_scroll(float) {
 
 }
 
+void CanvasItemEditor::_set_anchor(Control::AnchorType p_left,Control::AnchorType p_top,Control::AnchorType p_right,Control::AnchorType p_bottom) {
+	List<Node*> &selection = editor_selection->get_selected_node_list();
+
+	undo_redo->create_action("Change Anchors");
+	for(List<Node*>::Element *E=selection.front();E;E=E->next()) {
+
+		Control *c = E->get()->cast_to<Control>();
+
+		undo_redo->add_do_method(c,"set_anchor",MARGIN_LEFT,p_left);
+		undo_redo->add_do_method(c,"set_anchor",MARGIN_TOP,p_top);
+		undo_redo->add_do_method(c,"set_anchor",MARGIN_RIGHT,p_right);
+		undo_redo->add_do_method(c,"set_anchor",MARGIN_BOTTOM,p_bottom);
+		undo_redo->add_undo_method(c,"set_anchor",MARGIN_LEFT,c->get_anchor(MARGIN_LEFT));
+		undo_redo->add_undo_method(c,"set_anchor",MARGIN_TOP,c->get_anchor(MARGIN_TOP));
+		undo_redo->add_undo_method(c,"set_anchor",MARGIN_RIGHT,c->get_anchor(MARGIN_RIGHT));
+		undo_redo->add_undo_method(c,"set_anchor",MARGIN_BOTTOM,c->get_anchor(MARGIN_BOTTOM));
+	}
+
+	undo_redo->commit_action();
+
+}
 
 void CanvasItemEditor::_popup_callback(int p_op) {
 
@@ -2381,6 +2446,56 @@ void CanvasItemEditor::_popup_callback(int p_op) {
 		case SPACE_VERTICAL: {
 			//space_selected_items< proj_vector2_y, compare_items_y >();
 		} break;
+		case ANCHOR_ALIGN_TOP_LEFT: {
+			_set_anchor(ANCHOR_BEGIN,ANCHOR_BEGIN,ANCHOR_BEGIN,ANCHOR_BEGIN);
+		} break;
+		case ANCHOR_ALIGN_TOP_RIGHT: {
+			_set_anchor(ANCHOR_END,ANCHOR_BEGIN,ANCHOR_END,ANCHOR_BEGIN);
+		} break;
+		case ANCHOR_ALIGN_BOTTOM_LEFT: {
+			_set_anchor(ANCHOR_BEGIN,ANCHOR_END,ANCHOR_BEGIN,ANCHOR_END);
+		} break;
+		case ANCHOR_ALIGN_BOTTOM_RIGHT: {
+			_set_anchor(ANCHOR_END,ANCHOR_END,ANCHOR_END,ANCHOR_END);
+		} break;
+		case ANCHOR_ALIGN_CENTER_LEFT: {
+			_set_anchor(ANCHOR_BEGIN,ANCHOR_CENTER,ANCHOR_BEGIN,ANCHOR_CENTER);
+		} break;
+		case ANCHOR_ALIGN_CENTER_RIGHT: {
+
+			_set_anchor(ANCHOR_END,ANCHOR_CENTER,ANCHOR_END,ANCHOR_CENTER);
+		} break;
+		case ANCHOR_ALIGN_CENTER_TOP: {
+			_set_anchor(ANCHOR_CENTER,ANCHOR_BEGIN,ANCHOR_CENTER,ANCHOR_BEGIN);
+		} break;
+		case ANCHOR_ALIGN_CENTER_BOTTOM: {
+			_set_anchor(ANCHOR_CENTER,ANCHOR_END,ANCHOR_CENTER,ANCHOR_END);
+		} break;
+		case ANCHOR_ALIGN_CENTER: {
+			_set_anchor(ANCHOR_CENTER,ANCHOR_CENTER,ANCHOR_CENTER,ANCHOR_CENTER);
+		} break;
+		case ANCHOR_ALIGN_TOP_WIDE: {
+			_set_anchor(ANCHOR_BEGIN,ANCHOR_BEGIN,ANCHOR_END,ANCHOR_BEGIN);
+		} break;
+		case ANCHOR_ALIGN_LEFT_WIDE: {
+			_set_anchor(ANCHOR_BEGIN,ANCHOR_BEGIN,ANCHOR_BEGIN,ANCHOR_END);
+		} break;
+		case ANCHOR_ALIGN_RIGHT_WIDE: {
+			_set_anchor(ANCHOR_END,ANCHOR_BEGIN,ANCHOR_END,ANCHOR_END);
+		} break;
+		case ANCHOR_ALIGN_BOTTOM_WIDE: {
+			_set_anchor(ANCHOR_BEGIN,ANCHOR_END,ANCHOR_END,ANCHOR_END);
+		} break;
+		case ANCHOR_ALIGN_VCENTER_WIDE: {
+			_set_anchor(ANCHOR_CENTER,ANCHOR_BEGIN,ANCHOR_CENTER,ANCHOR_END);
+		} break;
+		case ANCHOR_ALIGN_HCENTER_WIDE: {
+			_set_anchor(ANCHOR_BEGIN,ANCHOR_CENTER,ANCHOR_END,ANCHOR_CENTER);
+		} break;
+		case ANCHOR_ALIGN_WIDE: {
+			_set_anchor(ANCHOR_BEGIN,ANCHOR_BEGIN,ANCHOR_END,ANCHOR_END);
+		} break;
+
 		case ANIM_INSERT_KEY:
 		case ANIM_INSERT_KEY_EXISTING: {
 
@@ -2999,6 +3114,14 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
 	p->add_item("Center Selection", VIEW_CENTER_TO_SELECTION, KEY_F);
 	p->add_item("Frame Selection", VIEW_FRAME_TO_SELECTION, KEY_MASK_CMD|KEY_F);
 
+	anchor_menu = memnew( MenuButton );
+	anchor_menu->set_text("Anchor");
+	hb->add_child(anchor_menu);
+	anchor_menu->get_popup()->connect("item_pressed", this,"_popup_callback");
+	anchor_menu->hide();
+
+	//p = anchor_menu->get_popup();
+
 
 
 	animation_hb = memnew( HBoxContainer );
diff --git a/tools/editor/plugins/canvas_item_editor_plugin.h b/tools/editor/plugins/canvas_item_editor_plugin.h
index 48a34e2d07..485422028e 100644
--- a/tools/editor/plugins/canvas_item_editor_plugin.h
+++ b/tools/editor/plugins/canvas_item_editor_plugin.h
@@ -90,6 +90,23 @@ class CanvasItemEditor : public VBoxContainer {
 		UNGROUP_SELECTED,
 		ALIGN_HORIZONTAL,
 		ALIGN_VERTICAL,
+		ANCHOR_ALIGN_TOP_LEFT,
+		ANCHOR_ALIGN_TOP_RIGHT,
+		ANCHOR_ALIGN_BOTTOM_LEFT,
+		ANCHOR_ALIGN_BOTTOM_RIGHT,
+		ANCHOR_ALIGN_CENTER_LEFT,
+		ANCHOR_ALIGN_CENTER_RIGHT,
+		ANCHOR_ALIGN_CENTER_TOP,
+		ANCHOR_ALIGN_CENTER_BOTTOM,
+		ANCHOR_ALIGN_CENTER,
+		ANCHOR_ALIGN_TOP_WIDE,
+		ANCHOR_ALIGN_LEFT_WIDE,
+		ANCHOR_ALIGN_RIGHT_WIDE,
+		ANCHOR_ALIGN_BOTTOM_WIDE,
+		ANCHOR_ALIGN_VCENTER_WIDE,
+		ANCHOR_ALIGN_HCENTER_WIDE,
+		ANCHOR_ALIGN_WIDE,
+
 		SPACE_HORIZONTAL,
 		SPACE_VERTICAL,
 		EXPAND_TO_PARENT,
@@ -225,6 +242,7 @@ class CanvasItemEditor : public VBoxContainer {
 	MenuButton *view_menu;
 	HBoxContainer *animation_hb;
 	MenuButton *animation_menu;
+	MenuButton *anchor_menu;
 
 	Button *key_loc_button;
 	Button *key_rot_button;
@@ -305,6 +323,8 @@ class CanvasItemEditor : public VBoxContainer {
 	void _viewport_input_event(const InputEvent& p_event);
 	void _viewport_draw();
 
+	void _set_anchor(Control::AnchorType p_left,Control::AnchorType p_top,Control::AnchorType p_right,Control::AnchorType p_bottom);
+
 	HSplitContainer *palette_split;
 	VSplitContainer *bottom_split;
 
diff --git a/tools/editor/plugins/editor_preview_plugins.cpp b/tools/editor/plugins/editor_preview_plugins.cpp
index a77ba9a605..c2b3ecfcda 100644
--- a/tools/editor/plugins/editor_preview_plugins.cpp
+++ b/tools/editor/plugins/editor_preview_plugins.cpp
@@ -25,7 +25,7 @@ Ref<Texture> EditorTexturePreviewPlugin::generate(const RES& p_from) {
 	if (img.is_compressed()) {
 		if (img.decompress()!=OK)
 			return Ref<Texture>();
-	} else if (img.get_format()!=Image::FORMAT_RGB && img.get_format()!=Image::FORMAT_RGB) {
+    } else if (img.get_format()!=Image::FORMAT_RGB && img.get_format()!=Image::FORMAT_RGBA) {
 		img.convert(Image::FORMAT_RGBA);
 	}
 
diff --git a/tools/editor/plugins/mesh_editor_plugin.cpp b/tools/editor/plugins/mesh_editor_plugin.cpp
index 2c64b2eb6b..13d4c8db5a 100644
--- a/tools/editor/plugins/mesh_editor_plugin.cpp
+++ b/tools/editor/plugins/mesh_editor_plugin.cpp
@@ -216,6 +216,8 @@ MeshInstanceEditor::MeshInstanceEditor() {
 	SpatialEditor::get_singleton()->add_control_to_menu_panel(options);
 
 	options->set_text("Mesh");
+	options->set_icon(EditorNode::get_singleton()->get_gui_base()->get_icon("MeshInstance","EditorIcons"));
+
 	options->get_popup()->add_item("Create Trimesh Static Body",MENU_OPTION_CREATE_STATIC_TRIMESH_BODY);
 	options->get_popup()->add_item("Create Convex Static Body",MENU_OPTION_CREATE_STATIC_CONVEX_BODY);
 	options->get_popup()->add_separator();
diff --git a/tools/editor/plugins/multimesh_editor_plugin.cpp b/tools/editor/plugins/multimesh_editor_plugin.cpp
index 0df906117e..3c88b1d3a8 100644
--- a/tools/editor/plugins/multimesh_editor_plugin.cpp
+++ b/tools/editor/plugins/multimesh_editor_plugin.cpp
@@ -330,6 +330,8 @@ MultiMeshEditor::MultiMeshEditor() {
 	options->set_area_as_parent_rect();
 
 	options->set_text("MultiMesh");
+	options->set_icon(EditorNode::get_singleton()->get_gui_base()->get_icon("MultiMeshInstance","EditorIcons"));
+
 	options->get_popup()->add_item("Populate Surface");
 	options->get_popup()->connect("item_pressed", this,"_menu_option");
 
diff --git a/tools/editor/plugins/particles_2d_editor_plugin.cpp b/tools/editor/plugins/particles_2d_editor_plugin.cpp
index fdf534a3a8..dadfa8bfdc 100644
--- a/tools/editor/plugins/particles_2d_editor_plugin.cpp
+++ b/tools/editor/plugins/particles_2d_editor_plugin.cpp
@@ -146,6 +146,7 @@ void Particles2DEditorPlugin::_notification(int p_what) {
 	if (p_what==NOTIFICATION_ENTER_TREE) {
 
 		menu->get_popup()->connect("item_pressed",this,"_menu_callback");
+		menu->set_icon(menu->get_popup()->get_icon("Particles2D","EditorIcons"));
 		file->connect("file_selected",this,"_file_selected");
 	}
 }
diff --git a/tools/editor/plugins/particles_editor_plugin.cpp b/tools/editor/plugins/particles_editor_plugin.cpp
index f6f01d82ca..5c84d9a86a 100644
--- a/tools/editor/plugins/particles_editor_plugin.cpp
+++ b/tools/editor/plugins/particles_editor_plugin.cpp
@@ -111,6 +111,7 @@ void ParticlesEditor::_populate() {
 void ParticlesEditor::_notification(int p_notification) {
 
 	if (p_notification==NOTIFICATION_ENTER_TREE) {
+		options->set_icon(options->get_popup()->get_icon("Particles","EditorIcons"));
 
 	}
 }
diff --git a/tools/editor/plugins/path_editor_plugin.cpp b/tools/editor/plugins/path_editor_plugin.cpp
index 4af22e956f..f4bdf50fe9 100644
--- a/tools/editor/plugins/path_editor_plugin.cpp
+++ b/tools/editor/plugins/path_editor_plugin.cpp
@@ -1,597 +1,597 @@
-/*************************************************************************/

-/*  path_editor_plugin.cpp                                               */

-/*************************************************************************/

-/*                       This file is part of:                           */

-/*                           GODOT ENGINE                                */

-/*                    http://www.godotengine.org                         */

-/*************************************************************************/

-/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */

-/*                                                                       */

-/* Permission is hereby granted, free of charge, to any person obtaining */

-/* a copy of this software and associated documentation files (the       */

-/* "Software"), to deal in the Software without restriction, including   */

-/* without limitation the rights to use, copy, modify, merge, publish,   */

-/* distribute, sublicense, and/or sell copies of the Software, and to    */

-/* permit persons to whom the Software is furnished to do so, subject to */

-/* the following conditions:                                             */

-/*                                                                       */

-/* The above copyright notice and this permission notice shall be        */

-/* included in all copies or substantial portions of the Software.       */

-/*                                                                       */

-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */

-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */

-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/

-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */

-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */

-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */

-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */

-/*************************************************************************/

-#include "path_editor_plugin.h"

-#include "spatial_editor_plugin.h"

-#include "scene/resources/curve.h"

-#include "os/keyboard.h"

-

-String PathSpatialGizmo::get_handle_name(int p_idx) const {

-

-	Ref<Curve3D> c = path->get_curve();

-	if (c.is_null())

-		return "";

-

-	if (p_idx<c->get_point_count()) {

-

-		return "Curve Point #"+itos(p_idx);

-	}

-

-	p_idx=p_idx-c->get_point_count()+1;

-

-	int idx=p_idx/2;

-	int t=p_idx%2;

-	String n = "Curve Point #"+itos(idx);

-	if (t==0)

-		n+=" In";

-	else

-		n+=" Out";

-

-	return n;

-

-

-}

-Variant PathSpatialGizmo::get_handle_value(int p_idx) const{

-

-	Ref<Curve3D> c = path->get_curve();

-	if (c.is_null())

-		return Variant();

-

-	if (p_idx<c->get_point_count()) {

-

-		original=c->get_point_pos(p_idx);

-		return original;

-	}

-

-	p_idx=p_idx-c->get_point_count()+1;

-

-	int idx=p_idx/2;

-	int t=p_idx%2;

-

-	Vector3 ofs;

-	if (t==0)

-		ofs=c->get_point_in(idx);

-	else

-		ofs= c->get_point_out(idx);

-

-	original=ofs+c->get_point_pos(idx);

-

-	return ofs;

-

-}

-void PathSpatialGizmo::set_handle(int p_idx,Camera *p_camera, const Point2& p_point){

-

-	Ref<Curve3D> c = path->get_curve();

-	if (c.is_null())

-		return;

-

-	Transform gt = path->get_global_transform();

-	Transform gi = gt.affine_inverse();

-	Vector3 ray_from = p_camera->project_ray_origin(p_point);

-	Vector3 ray_dir = p_camera->project_ray_normal(p_point);

-

-	if (p_idx<c->get_point_count()) {

-

-		Plane p(gt.xform(original),p_camera->get_transform().basis.get_axis(2));

-

-		Vector3 inters;

-

-		if (p.intersects_ray(ray_from,ray_dir,&inters)) {

-

-			Vector3 local = gi.xform(inters);

-			c->set_point_pos(p_idx,local);

-		}

-

-		return;

-	}

-

-	p_idx=p_idx-c->get_point_count()+1;

-

-	int idx=p_idx/2;

-	int t=p_idx%2;

-

-	Vector3 base = c->get_point_pos(idx);

-

-	Plane p(gt.xform(original),p_camera->get_transform().basis.get_axis(2));

-

-	Vector3 inters;

-

-	if (p.intersects_ray(ray_from,ray_dir,&inters)) {

-

-		Vector3 local = gi.xform(inters)-base;

-		if (t==0) {

-			c->set_point_in(idx,local);

-		} else {

-			c->set_point_out(idx,local);

-		}

-	}

-

-}

-

-void PathSpatialGizmo::commit_handle(int p_idx,const Variant& p_restore,bool p_cancel){

-

-	Ref<Curve3D> c = path->get_curve();

-	if (c.is_null())

-		return;

-

-	UndoRedo *ur = SpatialEditor::get_singleton()->get_undo_redo();

-

-	if (p_idx<c->get_point_count()) {

-

-		if (p_cancel) {

-

-			c->set_point_pos(p_idx,p_restore);

-			return;

-		}

-		ur->create_action("Set Curve Point Pos");

-		ur->add_do_method(c.ptr(),"set_point_pos",p_idx,c->get_point_pos(p_idx));

-		ur->add_undo_method(c.ptr(),"set_point_pos",p_idx,p_restore);

-		ur->commit_action();

-

-		return;

-	}

-

-	p_idx=p_idx-c->get_point_count()+1;

-

-	int idx=p_idx/2;

-	int t=p_idx%2;

-

-	Vector3 ofs;

-

-	if (p_cancel) {

-

-

-

-		return;

-	}

-

-

-

-	if (t==0) {

-

-		if (p_cancel) {

-

-			c->set_point_in(p_idx,p_restore);

-			return;

-		}

-		ur->create_action("Set Curve In Pos");

-		ur->add_do_method(c.ptr(),"set_point_in",idx,c->get_point_in(idx));

-		ur->add_undo_method(c.ptr(),"set_point_in",idx,p_restore);

-		ur->commit_action();

-

-

-	} else {

-		if (p_cancel) {

-

-			c->set_point_out(idx,p_restore);

-			return;

-		}

-		ur->create_action("Set Curve Out Pos");

-		ur->add_do_method(c.ptr(),"set_point_out",idx,c->get_point_out(idx));

-		ur->add_undo_method(c.ptr(),"set_point_out",idx,p_restore);

-		ur->commit_action();

-

-	}

-

-}

-

-

-void PathSpatialGizmo::redraw(){

-

-	clear();

-

-	Ref<Curve3D> c = path->get_curve();

-	if (c.is_null())

-		return;

-

-	Vector3Array v3a=c->tesselate();

-	//Vector3Array v3a=c->get_baked_points();

-

-	int v3s = v3a.size();

-	if (v3s==0)

-		return;

-	Vector<Vector3> v3p;

-	Vector3Array::Read r = v3a.read();

-

-	for(int i=0;i<v3s-1;i++) {

-

-		v3p.push_back(r[i]);

-		v3p.push_back(r[i+1]);

-		//v3p.push_back(r[i]);

-		//v3p.push_back(r[i]+Vector3(0,0.2,0));

-	}

-

-	add_lines(v3p,PathEditorPlugin::singleton->path_material);

-	add_collision_segments(v3p);

-

-	if (PathEditorPlugin::singleton->get_edited_path()==path) {

-		v3p.clear();

-		Vector<Vector3> handles;

-		Vector<Vector3> sec_handles;

-

-		for(int i=0;i<c->get_point_count();i++) {

-

-			Vector3 p = c->get_point_pos(i);

-			handles.push_back(p);

-			if (i>0) {

-				v3p.push_back(p);

-				v3p.push_back(p+c->get_point_in(i));

-				sec_handles.push_back(p+c->get_point_in(i));

-			}

-

-			if (i<c->get_point_count()-1) {

-				v3p.push_back(p);

-				v3p.push_back(p+c->get_point_out(i));

-				sec_handles.push_back(p+c->get_point_out(i));

-			}

-		}

-

-		add_lines(v3p,PathEditorPlugin::singleton->path_thin_material);

-		add_handles(handles);

-		add_handles(sec_handles,false,true);

-	}

-

-}

-

-PathSpatialGizmo::PathSpatialGizmo(Path* p_path){

-

-	path=p_path;

-	set_spatial_node(p_path);

-

-

-

-}

-

-bool PathEditorPlugin::create_spatial_gizmo(Spatial* p_spatial) {

-

-	if (p_spatial->cast_to<Path>()) {

-

-

-		Ref<PathSpatialGizmo> psg = memnew( PathSpatialGizmo(p_spatial->cast_to<Path>()));

-		p_spatial->set_gizmo(psg);

-		return true;

-	}

-

-	return false;

-}

-

-bool PathEditorPlugin::forward_spatial_input_event(Camera* p_camera,const InputEvent& p_event) {

-

-	if (!path)

-		return false;

-	Ref<Curve3D> c=path->get_curve();

-	if (c.is_null())

-		return false;

-	Transform gt = path->get_global_transform();

-	Transform it = gt.affine_inverse();

-

-	static const int click_dist = 10; //should make global

-

-

-	if (p_event.type==InputEvent::MOUSE_BUTTON) {

-

-		const InputEventMouseButton &mb=p_event.mouse_button;

-		Point2 mbpos(mb.x,mb.y);

-

-		if (mb.pressed && mb.button_index==BUTTON_LEFT && (curve_create->is_pressed() || (curve_edit->is_pressed() && mb.mod.control))) {

-			//click into curve, break it down

-			Vector3Array v3a = c->tesselate();

-			int idx=0;

-			int rc=v3a.size();

-			int closest_seg=-1;

-			Vector3 closest_seg_point;

-			float closest_d=1e20;

-

-			if (rc>=2) {

-				Vector3Array::Read r = v3a.read();

-

-				if (p_camera->unproject_position(gt.xform(c->get_point_pos(0))).distance_to(mbpos)<click_dist)

-					return false; //nope, existing

-

-

-				for(int i=0;i<c->get_point_count()-1;i++) {

-					//find the offset and point index of the place to break up

-					int j=idx;

-					if (p_camera->unproject_position(gt.xform(c->get_point_pos(i+1))).distance_to(mbpos)<click_dist)

-						return false; //nope, existing

-

-

-					while(j<rc && c->get_point_pos(i+1)!=r[j]) {

-

-						Vector3 from =r[j];

-						Vector3 to =r[j+1];

-						real_t cdist = from.distance_to(to);

-						from=gt.xform(from);

-						to=gt.xform(to);

-						if (cdist>0) {

-							Vector2 s[2];

-							s[0] = p_camera->unproject_position(from);

-							s[1] = p_camera->unproject_position(to);

-							Vector2 inters = Geometry::get_closest_point_to_segment_2d(mbpos,s);

-							float d = inters.distance_to(mbpos);

-

-							if (d<10 && d<closest_d) {

-

-

-								closest_d=d;

-								closest_seg=i;

-								Vector3 ray_from=p_camera->project_ray_origin(mbpos);

-								Vector3 ray_dir=p_camera->project_ray_normal(mbpos);

-

-								Vector3 ra,rb;

-								Geometry::get_closest_points_between_segments(ray_from,ray_from+ray_dir*4096,from,to,ra,rb);

-

-								closest_seg_point=it.xform(rb);

-							}

-

-						}

-						j++;

-

-					}

-					if (idx==j)

-						idx++; //force next

-					else

-						idx=j; //swap

-

-

-					if (j==rc)

-						break;

-				}

-			}

-

-			UndoRedo *ur = editor->get_undo_redo();

-			if (closest_seg!=-1) {

-				//subdivide

-

-				ur->create_action("Split Path");

-				ur->add_do_method(c.ptr(),"add_point",closest_seg_point,Vector3(),Vector3(),closest_seg+1);

-				ur->add_undo_method(c.ptr(),"remove_point",closest_seg+1);

-				ur->commit_action();;

-				return true;

-

-			} else {

-

-				Vector3 org;

-				if (c->get_point_count()==0)

-					org=path->get_transform().get_origin();

-				else

-					org=gt.xform(c->get_point_pos(c->get_point_count()));

-				Plane p(org,p_camera->get_transform().basis.get_axis(2));

-				Vector3 ray_from=p_camera->project_ray_origin(mbpos);

-				Vector3 ray_dir=p_camera->project_ray_normal(mbpos);

-

-				Vector3 inters;

-				if (p.intersects_ray(ray_from,ray_dir,&inters)) {

-

-					ur->create_action("Add Point to Curve");

-					ur->add_do_method(c.ptr(),"add_point",it.xform(inters),Vector3(),Vector3(),-1);

-					ur->add_undo_method(c.ptr(),"remove_point",c->get_point_count());

-					ur->commit_action();;

-					return true;

-				}

-

-				//add new at pos

-			}

-

-		} else if (mb.pressed && ((mb.button_index==BUTTON_LEFT && curve_del->is_pressed()) || (mb.button_index==BUTTON_RIGHT && curve_edit->is_pressed()))) {

-

-			int erase_idx=-1;

-			for(int i=0;i<c->get_point_count();i++) {

-				//find the offset and point index of the place to break up

-				if (p_camera->unproject_position(gt.xform(c->get_point_pos(i))).distance_to(mbpos)<click_dist) {

-

-					erase_idx=i;

-					break;

-				}

-			}

-

-			if (erase_idx!=-1) {

-

-				UndoRedo *ur = editor->get_undo_redo();

-				ur->create_action("Remove Path Point");

-				ur->add_do_method(c.ptr(),"remove_point",erase_idx);

-				ur->add_undo_method(c.ptr(),"add_point",c->get_point_pos(erase_idx),c->get_point_in(erase_idx),c->get_point_out(erase_idx),erase_idx);

-				ur->commit_action();

-				return true;

-			}

-		}

-

-	}

-

-	return false;

-}

-

-

-void PathEditorPlugin::edit(Object *p_object) {

-

-	if (p_object) {

-		path=p_object->cast_to<Path>();

-		if (path) {

-

-			if (path->get_curve().is_valid()) {

-				path->get_curve()->emit_signal("changed");

-			}

-		}

-	} else {

-		Path *pre=path;

-		path=NULL;

-		if (pre) {

-			pre->get_curve()->emit_signal("changed");

-		}

-	}

-//	collision_polygon_editor->edit(p_object->cast_to<Node>());

-}

-

-bool PathEditorPlugin::handles(Object *p_object) const {

-

-	return p_object->is_type("Path");

-}

-

-void PathEditorPlugin::make_visible(bool p_visible) {

-

-	if (p_visible) {

-

-		curve_create->show();

-		curve_edit->show();

-		curve_del->show();

-        curve_close->show();

-        sep->show();

-	} else {

-

-		curve_create->hide();

-		curve_edit->hide();

-		curve_del->hide();

-        curve_close->hide();

-        sep->hide();

-

-		{

-			Path *pre=path;

-			path=NULL;

-			if (pre && pre->get_curve().is_valid()) {

-				pre->get_curve()->emit_signal("changed");

-			}

-		}

-	}

-

-}

-

-void PathEditorPlugin::_mode_changed(int p_idx) {

-

-	curve_create->set_pressed(p_idx==0);

-	curve_edit->set_pressed(p_idx==1);

-	curve_del->set_pressed(p_idx==2);

-}

-

-void PathEditorPlugin::_close_curve() {

-

-    Ref<Curve3D> c = path->get_curve();

-    if (c.is_null())

-        return ;

-    if (c->get_point_count()<2)

-        return;

-    c->add_point(c->get_point_pos(0),c->get_point_in(0),c->get_point_out(0));

-

-}

-

-void PathEditorPlugin::_notification(int p_what) {

-

-	if (p_what==NOTIFICATION_ENTER_TREE) {

-

-		curve_create->connect("pressed",this,"_mode_changed",make_binds(0));

-		curve_edit->connect("pressed",this,"_mode_changed",make_binds(1));

-		curve_del->connect("pressed",this,"_mode_changed",make_binds(2));

-        curve_close->connect("pressed",this,"_close_curve");

-    }

-}

-

-void PathEditorPlugin::_bind_methods() {

-

-	ObjectTypeDB::bind_method(_MD("_mode_changed"),&PathEditorPlugin::_mode_changed);

-    ObjectTypeDB::bind_method(_MD("_close_curve"),&PathEditorPlugin::_close_curve);

-}

-

-PathEditorPlugin* PathEditorPlugin::singleton=NULL;

-

-

-PathEditorPlugin::PathEditorPlugin(EditorNode *p_node) {

-

-	path=NULL;

-	editor=p_node;

-	singleton=this;

-

-	path_material = Ref<FixedMaterial>( memnew( FixedMaterial ));

-	path_material->set_parameter( FixedMaterial::PARAM_DIFFUSE,Color(0.5,0.5,1.0,0.8) );

-	path_material->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA, true);

-	path_material->set_line_width(3);

-	path_material->set_flag(Material::FLAG_DOUBLE_SIDED,true);

-	path_material->set_flag(Material::FLAG_UNSHADED,true);

-

-	path_thin_material = Ref<FixedMaterial>( memnew( FixedMaterial ));

-	path_thin_material->set_parameter( FixedMaterial::PARAM_DIFFUSE,Color(0.5,0.5,1.0,0.4) );

-	path_thin_material->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA, true);

-	path_thin_material->set_line_width(1);

-	path_thin_material->set_flag(Material::FLAG_DOUBLE_SIDED,true);

-	path_thin_material->set_flag(Material::FLAG_UNSHADED,true);

-

-	SpatialEditor::get_singleton()->add_gizmo_plugin(this);

-

-	sep = memnew( VSeparator);

-	sep->hide();

-	SpatialEditor::get_singleton()->add_control_to_menu_panel(sep);

-	curve_edit = memnew( ToolButton );

-	curve_edit->set_icon(SpatialEditor::get_singleton()->get_icon("CurveEdit","EditorIcons"));

-	curve_edit->set_toggle_mode(true);

-	curve_edit->hide();

-	curve_edit->set_focus_mode(Control::FOCUS_NONE);

-	curve_edit->set_tooltip("Select Points\nShift+Drag: Select Control Points\n"+keycode_get_string(KEY_MASK_CMD)+"Click: Add Point\nRight Click: Delete Point.");

-	SpatialEditor::get_singleton()->add_control_to_menu_panel(curve_edit);

-	curve_create = memnew( ToolButton );

-	curve_create->set_icon(SpatialEditor::get_singleton()->get_icon("CurveCreate","EditorIcons"));

-	curve_create->set_toggle_mode(true);

-	curve_create->hide();

-	curve_create->set_focus_mode(Control::FOCUS_NONE);

-	curve_create->set_tooltip("Add Point (in empty space)\nSplit Segment (in curve).");

-	SpatialEditor::get_singleton()->add_control_to_menu_panel(curve_create);

-	curve_del = memnew( ToolButton );

-	curve_del->set_icon(SpatialEditor::get_singleton()->get_icon("CurveDelete","EditorIcons"));

-	curve_del->set_toggle_mode(true);

-	curve_del->hide();

-	curve_del->set_focus_mode(Control::FOCUS_NONE);

-	curve_del->set_tooltip("Delete Point.");

-	SpatialEditor::get_singleton()->add_control_to_menu_panel(curve_del);

-	curve_close = memnew( ToolButton );

-	curve_close->set_icon(SpatialEditor::get_singleton()->get_icon("CurveClose","EditorIcons"));

-	curve_close->hide();

-	curve_close->set_focus_mode(Control::FOCUS_NONE);

-	curve_close->set_tooltip("Close Curve");

-	SpatialEditor::get_singleton()->add_control_to_menu_panel(curve_close);

-

-

-

-	curve_edit->set_pressed(true);

-	/*

-	collision_polygon_editor = memnew( PathEditor(p_node) );

-	editor->get_viewport()->add_child(collision_polygon_editor);

-

-	collision_polygon_editor->set_margin(MARGIN_LEFT,200);

-	collision_polygon_editor->set_margin(MARGIN_RIGHT,230);

-	collision_polygon_editor->set_margin(MARGIN_TOP,0);

-	collision_polygon_editor->set_margin(MARGIN_BOTTOM,10);

-

-

-	collision_polygon_editor->hide();

-	*/

-

-

-}

-

-

-PathEditorPlugin::~PathEditorPlugin()

-{

-}

-

+/*************************************************************************/
+/*  path_editor_plugin.cpp                                               */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+#include "path_editor_plugin.h"
+#include "spatial_editor_plugin.h"
+#include "scene/resources/curve.h"
+#include "os/keyboard.h"
+
+String PathSpatialGizmo::get_handle_name(int p_idx) const {
+
+	Ref<Curve3D> c = path->get_curve();
+	if (c.is_null())
+		return "";
+
+	if (p_idx<c->get_point_count()) {
+
+		return "Curve Point #"+itos(p_idx);
+	}
+
+	p_idx=p_idx-c->get_point_count()+1;
+
+	int idx=p_idx/2;
+	int t=p_idx%2;
+	String n = "Curve Point #"+itos(idx);
+	if (t==0)
+		n+=" In";
+	else
+		n+=" Out";
+
+	return n;
+
+
+}
+Variant PathSpatialGizmo::get_handle_value(int p_idx) const{
+
+	Ref<Curve3D> c = path->get_curve();
+	if (c.is_null())
+		return Variant();
+
+	if (p_idx<c->get_point_count()) {
+
+		original=c->get_point_pos(p_idx);
+		return original;
+	}
+
+	p_idx=p_idx-c->get_point_count()+1;
+
+	int idx=p_idx/2;
+	int t=p_idx%2;
+
+	Vector3 ofs;
+	if (t==0)
+		ofs=c->get_point_in(idx);
+	else
+		ofs= c->get_point_out(idx);
+
+	original=ofs+c->get_point_pos(idx);
+
+	return ofs;
+
+}
+void PathSpatialGizmo::set_handle(int p_idx,Camera *p_camera, const Point2& p_point){
+
+	Ref<Curve3D> c = path->get_curve();
+	if (c.is_null())
+		return;
+
+	Transform gt = path->get_global_transform();
+	Transform gi = gt.affine_inverse();
+	Vector3 ray_from = p_camera->project_ray_origin(p_point);
+	Vector3 ray_dir = p_camera->project_ray_normal(p_point);
+
+	if (p_idx<c->get_point_count()) {
+
+		Plane p(gt.xform(original),p_camera->get_transform().basis.get_axis(2));
+
+		Vector3 inters;
+
+		if (p.intersects_ray(ray_from,ray_dir,&inters)) {
+
+			Vector3 local = gi.xform(inters);
+			c->set_point_pos(p_idx,local);
+		}
+
+		return;
+	}
+
+	p_idx=p_idx-c->get_point_count()+1;
+
+	int idx=p_idx/2;
+	int t=p_idx%2;
+
+	Vector3 base = c->get_point_pos(idx);
+
+	Plane p(gt.xform(original),p_camera->get_transform().basis.get_axis(2));
+
+	Vector3 inters;
+
+	if (p.intersects_ray(ray_from,ray_dir,&inters)) {
+
+		Vector3 local = gi.xform(inters)-base;
+		if (t==0) {
+			c->set_point_in(idx,local);
+		} else {
+			c->set_point_out(idx,local);
+		}
+	}
+
+}
+
+void PathSpatialGizmo::commit_handle(int p_idx,const Variant& p_restore,bool p_cancel){
+
+	Ref<Curve3D> c = path->get_curve();
+	if (c.is_null())
+		return;
+
+	UndoRedo *ur = SpatialEditor::get_singleton()->get_undo_redo();
+
+	if (p_idx<c->get_point_count()) {
+
+		if (p_cancel) {
+
+			c->set_point_pos(p_idx,p_restore);
+			return;
+		}
+		ur->create_action("Set Curve Point Pos");
+		ur->add_do_method(c.ptr(),"set_point_pos",p_idx,c->get_point_pos(p_idx));
+		ur->add_undo_method(c.ptr(),"set_point_pos",p_idx,p_restore);
+		ur->commit_action();
+
+		return;
+	}
+
+	p_idx=p_idx-c->get_point_count()+1;
+
+	int idx=p_idx/2;
+	int t=p_idx%2;
+
+	Vector3 ofs;
+
+	if (p_cancel) {
+
+
+
+		return;
+	}
+
+
+
+	if (t==0) {
+
+		if (p_cancel) {
+
+			c->set_point_in(p_idx,p_restore);
+			return;
+		}
+		ur->create_action("Set Curve In Pos");
+		ur->add_do_method(c.ptr(),"set_point_in",idx,c->get_point_in(idx));
+		ur->add_undo_method(c.ptr(),"set_point_in",idx,p_restore);
+		ur->commit_action();
+
+
+	} else {
+		if (p_cancel) {
+
+			c->set_point_out(idx,p_restore);
+			return;
+		}
+		ur->create_action("Set Curve Out Pos");
+		ur->add_do_method(c.ptr(),"set_point_out",idx,c->get_point_out(idx));
+		ur->add_undo_method(c.ptr(),"set_point_out",idx,p_restore);
+		ur->commit_action();
+
+	}
+
+}
+
+
+void PathSpatialGizmo::redraw(){
+
+	clear();
+
+	Ref<Curve3D> c = path->get_curve();
+	if (c.is_null())
+		return;
+
+	Vector3Array v3a=c->tesselate();
+	//Vector3Array v3a=c->get_baked_points();
+
+	int v3s = v3a.size();
+	if (v3s==0)
+		return;
+	Vector<Vector3> v3p;
+	Vector3Array::Read r = v3a.read();
+
+	for(int i=0;i<v3s-1;i++) {
+
+		v3p.push_back(r[i]);
+		v3p.push_back(r[i+1]);
+		//v3p.push_back(r[i]);
+		//v3p.push_back(r[i]+Vector3(0,0.2,0));
+	}
+
+	add_lines(v3p,PathEditorPlugin::singleton->path_material);
+	add_collision_segments(v3p);
+
+	if (PathEditorPlugin::singleton->get_edited_path()==path) {
+		v3p.clear();
+		Vector<Vector3> handles;
+		Vector<Vector3> sec_handles;
+
+		for(int i=0;i<c->get_point_count();i++) {
+
+			Vector3 p = c->get_point_pos(i);
+			handles.push_back(p);
+			if (i>0) {
+				v3p.push_back(p);
+				v3p.push_back(p+c->get_point_in(i));
+				sec_handles.push_back(p+c->get_point_in(i));
+			}
+
+			if (i<c->get_point_count()-1) {
+				v3p.push_back(p);
+				v3p.push_back(p+c->get_point_out(i));
+				sec_handles.push_back(p+c->get_point_out(i));
+			}
+		}
+
+		add_lines(v3p,PathEditorPlugin::singleton->path_thin_material);
+		add_handles(handles);
+		add_handles(sec_handles,false,true);
+	}
+
+}
+
+PathSpatialGizmo::PathSpatialGizmo(Path* p_path){
+
+	path=p_path;
+	set_spatial_node(p_path);
+
+
+
+}
+
+bool PathEditorPlugin::create_spatial_gizmo(Spatial* p_spatial) {
+
+	if (p_spatial->cast_to<Path>()) {
+
+
+		Ref<PathSpatialGizmo> psg = memnew( PathSpatialGizmo(p_spatial->cast_to<Path>()));
+		p_spatial->set_gizmo(psg);
+		return true;
+	}
+
+	return false;
+}
+
+bool PathEditorPlugin::forward_spatial_input_event(Camera* p_camera,const InputEvent& p_event) {
+
+	if (!path)
+		return false;
+	Ref<Curve3D> c=path->get_curve();
+	if (c.is_null())
+		return false;
+	Transform gt = path->get_global_transform();
+	Transform it = gt.affine_inverse();
+
+	static const int click_dist = 10; //should make global
+
+
+	if (p_event.type==InputEvent::MOUSE_BUTTON) {
+
+		const InputEventMouseButton &mb=p_event.mouse_button;
+		Point2 mbpos(mb.x,mb.y);
+
+		if (mb.pressed && mb.button_index==BUTTON_LEFT && (curve_create->is_pressed() || (curve_edit->is_pressed() && mb.mod.control))) {
+			//click into curve, break it down
+			Vector3Array v3a = c->tesselate();
+			int idx=0;
+			int rc=v3a.size();
+			int closest_seg=-1;
+			Vector3 closest_seg_point;
+			float closest_d=1e20;
+
+			if (rc>=2) {
+				Vector3Array::Read r = v3a.read();
+
+				if (p_camera->unproject_position(gt.xform(c->get_point_pos(0))).distance_to(mbpos)<click_dist)
+					return false; //nope, existing
+
+
+				for(int i=0;i<c->get_point_count()-1;i++) {
+					//find the offset and point index of the place to break up
+					int j=idx;
+					if (p_camera->unproject_position(gt.xform(c->get_point_pos(i+1))).distance_to(mbpos)<click_dist)
+						return false; //nope, existing
+
+
+					while(j<rc && c->get_point_pos(i+1)!=r[j]) {
+
+						Vector3 from =r[j];
+						Vector3 to =r[j+1];
+						real_t cdist = from.distance_to(to);
+						from=gt.xform(from);
+						to=gt.xform(to);
+						if (cdist>0) {
+							Vector2 s[2];
+							s[0] = p_camera->unproject_position(from);
+							s[1] = p_camera->unproject_position(to);
+							Vector2 inters = Geometry::get_closest_point_to_segment_2d(mbpos,s);
+							float d = inters.distance_to(mbpos);
+
+							if (d<10 && d<closest_d) {
+
+
+								closest_d=d;
+								closest_seg=i;
+								Vector3 ray_from=p_camera->project_ray_origin(mbpos);
+								Vector3 ray_dir=p_camera->project_ray_normal(mbpos);
+
+								Vector3 ra,rb;
+								Geometry::get_closest_points_between_segments(ray_from,ray_from+ray_dir*4096,from,to,ra,rb);
+
+								closest_seg_point=it.xform(rb);
+							}
+
+						}
+						j++;
+
+					}
+					if (idx==j)
+						idx++; //force next
+					else
+						idx=j; //swap
+
+
+					if (j==rc)
+						break;
+				}
+			}
+
+			UndoRedo *ur = editor->get_undo_redo();
+			if (closest_seg!=-1) {
+				//subdivide
+
+				ur->create_action("Split Path");
+				ur->add_do_method(c.ptr(),"add_point",closest_seg_point,Vector3(),Vector3(),closest_seg+1);
+				ur->add_undo_method(c.ptr(),"remove_point",closest_seg+1);
+				ur->commit_action();;
+				return true;
+
+			} else {
+
+				Vector3 org;
+				if (c->get_point_count()==0)
+					org=path->get_transform().get_origin();
+				else
+					org=gt.xform(c->get_point_pos(c->get_point_count()));
+				Plane p(org,p_camera->get_transform().basis.get_axis(2));
+				Vector3 ray_from=p_camera->project_ray_origin(mbpos);
+				Vector3 ray_dir=p_camera->project_ray_normal(mbpos);
+
+				Vector3 inters;
+				if (p.intersects_ray(ray_from,ray_dir,&inters)) {
+
+					ur->create_action("Add Point to Curve");
+					ur->add_do_method(c.ptr(),"add_point",it.xform(inters),Vector3(),Vector3(),-1);
+					ur->add_undo_method(c.ptr(),"remove_point",c->get_point_count());
+					ur->commit_action();;
+					return true;
+				}
+
+				//add new at pos
+			}
+
+		} else if (mb.pressed && ((mb.button_index==BUTTON_LEFT && curve_del->is_pressed()) || (mb.button_index==BUTTON_RIGHT && curve_edit->is_pressed()))) {
+
+			int erase_idx=-1;
+			for(int i=0;i<c->get_point_count();i++) {
+				//find the offset and point index of the place to break up
+				if (p_camera->unproject_position(gt.xform(c->get_point_pos(i))).distance_to(mbpos)<click_dist) {
+
+					erase_idx=i;
+					break;
+				}
+			}
+
+			if (erase_idx!=-1) {
+
+				UndoRedo *ur = editor->get_undo_redo();
+				ur->create_action("Remove Path Point");
+				ur->add_do_method(c.ptr(),"remove_point",erase_idx);
+				ur->add_undo_method(c.ptr(),"add_point",c->get_point_pos(erase_idx),c->get_point_in(erase_idx),c->get_point_out(erase_idx),erase_idx);
+				ur->commit_action();
+				return true;
+			}
+		}
+
+	}
+
+	return false;
+}
+
+
+void PathEditorPlugin::edit(Object *p_object) {
+
+	if (p_object) {
+		path=p_object->cast_to<Path>();
+		if (path) {
+
+			if (path->get_curve().is_valid()) {
+				path->get_curve()->emit_signal("changed");
+			}
+		}
+	} else {
+		Path *pre=path;
+		path=NULL;
+		if (pre) {
+			pre->get_curve()->emit_signal("changed");
+		}
+	}
+//	collision_polygon_editor->edit(p_object->cast_to<Node>());
+}
+
+bool PathEditorPlugin::handles(Object *p_object) const {
+
+	return p_object->is_type("Path");
+}
+
+void PathEditorPlugin::make_visible(bool p_visible) {
+
+	if (p_visible) {
+
+		curve_create->show();
+		curve_edit->show();
+		curve_del->show();
+        curve_close->show();
+        sep->show();
+	} else {
+
+		curve_create->hide();
+		curve_edit->hide();
+		curve_del->hide();
+        curve_close->hide();
+        sep->hide();
+
+		{
+			Path *pre=path;
+			path=NULL;
+			if (pre && pre->get_curve().is_valid()) {
+				pre->get_curve()->emit_signal("changed");
+			}
+		}
+	}
+
+}
+
+void PathEditorPlugin::_mode_changed(int p_idx) {
+
+	curve_create->set_pressed(p_idx==0);
+	curve_edit->set_pressed(p_idx==1);
+	curve_del->set_pressed(p_idx==2);
+}
+
+void PathEditorPlugin::_close_curve() {
+
+    Ref<Curve3D> c = path->get_curve();
+    if (c.is_null())
+        return ;
+    if (c->get_point_count()<2)
+        return;
+    c->add_point(c->get_point_pos(0),c->get_point_in(0),c->get_point_out(0));
+
+}
+
+void PathEditorPlugin::_notification(int p_what) {
+
+	if (p_what==NOTIFICATION_ENTER_TREE) {
+
+		curve_create->connect("pressed",this,"_mode_changed",make_binds(0));
+		curve_edit->connect("pressed",this,"_mode_changed",make_binds(1));
+		curve_del->connect("pressed",this,"_mode_changed",make_binds(2));
+        curve_close->connect("pressed",this,"_close_curve");
+    }
+}
+
+void PathEditorPlugin::_bind_methods() {
+
+	ObjectTypeDB::bind_method(_MD("_mode_changed"),&PathEditorPlugin::_mode_changed);
+    ObjectTypeDB::bind_method(_MD("_close_curve"),&PathEditorPlugin::_close_curve);
+}
+
+PathEditorPlugin* PathEditorPlugin::singleton=NULL;
+
+
+PathEditorPlugin::PathEditorPlugin(EditorNode *p_node) {
+
+	path=NULL;
+	editor=p_node;
+	singleton=this;
+
+	path_material = Ref<FixedMaterial>( memnew( FixedMaterial ));
+	path_material->set_parameter( FixedMaterial::PARAM_DIFFUSE,Color(0.5,0.5,1.0,0.8) );
+	path_material->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA, true);
+	path_material->set_line_width(3);
+	path_material->set_flag(Material::FLAG_DOUBLE_SIDED,true);
+	path_material->set_flag(Material::FLAG_UNSHADED,true);
+
+	path_thin_material = Ref<FixedMaterial>( memnew( FixedMaterial ));
+	path_thin_material->set_parameter( FixedMaterial::PARAM_DIFFUSE,Color(0.5,0.5,1.0,0.4) );
+	path_thin_material->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA, true);
+	path_thin_material->set_line_width(1);
+	path_thin_material->set_flag(Material::FLAG_DOUBLE_SIDED,true);
+	path_thin_material->set_flag(Material::FLAG_UNSHADED,true);
+
+	SpatialEditor::get_singleton()->add_gizmo_plugin(this);
+
+	sep = memnew( VSeparator);
+	sep->hide();
+	SpatialEditor::get_singleton()->add_control_to_menu_panel(sep);
+	curve_edit = memnew( ToolButton );
+	curve_edit->set_icon(SpatialEditor::get_singleton()->get_icon("CurveEdit","EditorIcons"));
+	curve_edit->set_toggle_mode(true);
+	curve_edit->hide();
+	curve_edit->set_focus_mode(Control::FOCUS_NONE);
+	curve_edit->set_tooltip("Select Points\nShift+Drag: Select Control Points\n"+keycode_get_string(KEY_MASK_CMD)+"Click: Add Point\nRight Click: Delete Point.");
+	SpatialEditor::get_singleton()->add_control_to_menu_panel(curve_edit);
+	curve_create = memnew( ToolButton );
+	curve_create->set_icon(SpatialEditor::get_singleton()->get_icon("CurveCreate","EditorIcons"));
+	curve_create->set_toggle_mode(true);
+	curve_create->hide();
+	curve_create->set_focus_mode(Control::FOCUS_NONE);
+	curve_create->set_tooltip("Add Point (in empty space)\nSplit Segment (in curve).");
+	SpatialEditor::get_singleton()->add_control_to_menu_panel(curve_create);
+	curve_del = memnew( ToolButton );
+	curve_del->set_icon(SpatialEditor::get_singleton()->get_icon("CurveDelete","EditorIcons"));
+	curve_del->set_toggle_mode(true);
+	curve_del->hide();
+	curve_del->set_focus_mode(Control::FOCUS_NONE);
+	curve_del->set_tooltip("Delete Point.");
+	SpatialEditor::get_singleton()->add_control_to_menu_panel(curve_del);
+	curve_close = memnew( ToolButton );
+	curve_close->set_icon(SpatialEditor::get_singleton()->get_icon("CurveClose","EditorIcons"));
+	curve_close->hide();
+	curve_close->set_focus_mode(Control::FOCUS_NONE);
+	curve_close->set_tooltip("Close Curve");
+	SpatialEditor::get_singleton()->add_control_to_menu_panel(curve_close);
+
+
+
+	curve_edit->set_pressed(true);
+	/*
+	collision_polygon_editor = memnew( PathEditor(p_node) );
+	editor->get_viewport()->add_child(collision_polygon_editor);
+
+	collision_polygon_editor->set_margin(MARGIN_LEFT,200);
+	collision_polygon_editor->set_margin(MARGIN_RIGHT,230);
+	collision_polygon_editor->set_margin(MARGIN_TOP,0);
+	collision_polygon_editor->set_margin(MARGIN_BOTTOM,10);
+
+
+	collision_polygon_editor->hide();
+	*/
+
+
+}
+
+
+PathEditorPlugin::~PathEditorPlugin()
+{
+}
+
diff --git a/tools/editor/plugins/polygon_2d_editor_plugin.cpp b/tools/editor/plugins/polygon_2d_editor_plugin.cpp
index d25880fdff..3029dcf2ab 100644
--- a/tools/editor/plugins/polygon_2d_editor_plugin.cpp
+++ b/tools/editor/plugins/polygon_2d_editor_plugin.cpp
@@ -50,6 +50,9 @@ void Polygon2DEditor::_notification(int p_what) {
 			uv_button[UV_MODE_ROTATE]->set_icon(get_icon("ToolRotate","EditorIcons"));
 			uv_button[UV_MODE_SCALE]->set_icon(get_icon("ToolScale","EditorIcons"));
 
+			b_snap_grid->set_icon( get_icon("Grid", "EditorIcons"));
+			b_snap_enable->set_icon( get_icon("Snap", "EditorIcons"));
+			uv_icon_zoom->set_texture( get_icon("Zoom", "EditorIcons"));
 
 		} break;
 		case NOTIFICATION_FIXED_PROCESS: {
@@ -158,6 +161,41 @@ void Polygon2DEditor::_menu_option(int p_option) {
 	}
 }
 
+void Polygon2DEditor::_set_use_snap(bool p_use)
+{
+	use_snap=p_use;
+}
+
+void Polygon2DEditor::_set_show_grid(bool p_show)
+{
+	snap_show_grid=p_show;
+	uv_edit_draw->update();
+}
+
+void Polygon2DEditor::_set_snap_off_x(float p_val)
+{
+	snap_offset.x=p_val;
+	uv_edit_draw->update();
+}
+
+void Polygon2DEditor::_set_snap_off_y(float p_val)
+{
+	snap_offset.y=p_val;
+	uv_edit_draw->update();
+}
+
+void Polygon2DEditor::_set_snap_step_x(float p_val)
+{
+	snap_step.x=p_val;
+	uv_edit_draw->update();
+}
+
+void Polygon2DEditor::_set_snap_step_y(float p_val)
+{
+	snap_step.y=p_val;
+	uv_edit_draw->update();
+}
+
 void Polygon2DEditor::_wip_close() {
 
 	undo_redo->create_action("Create Poly");
@@ -494,7 +532,7 @@ void Polygon2DEditor::_uv_input(const InputEvent& p_input) {
 
 						Vector2 tuv=mtx.xform(uv_prev[i]);
 						if (tuv.distance_to(Vector2(mb.x,mb.y))<8) {
-
+							uv_drag_from=tuv;
 							uv_drag_index=i;
 						}
 					}
@@ -545,7 +583,7 @@ void Polygon2DEditor::_uv_input(const InputEvent& p_input) {
 
 		} else if (uv_drag) {
 
-			Vector2 uv_drag_to(mm.x,mm.y);
+			Vector2 uv_drag_to=snap_point(Vector2(mm.x,mm.y));
 			Vector2 drag = mtx.affine_inverse().xform(uv_drag_to) - mtx.affine_inverse().xform(uv_drag_from);
 
 
@@ -649,6 +687,33 @@ void Polygon2DEditor::_uv_draw() {
 	uv_edit_draw->draw_texture(base_tex,Point2());
 	VS::get_singleton()->canvas_item_add_set_transform(uv_edit_draw->get_canvas_item(),Matrix32());
 
+	if (snap_show_grid) {
+		Size2 s = uv_edit_draw->get_size();
+		int last_cell;
+
+		if (snap_step.x!=0) {
+			for(int i=0;i<s.width;i++) {
+				int cell = Math::fast_ftoi(Math::floor((mtx.affine_inverse().xform(Vector2(i,0)).x-snap_offset.x)/snap_step.x));
+				if (i==0)
+					last_cell=cell;
+				if (last_cell!=cell)
+					uv_edit_draw->draw_line(Point2(i,0),Point2(i,s.height),Color(0.3,0.7,1,0.3));
+				last_cell=cell;
+			}
+		}
+
+		if (snap_step.y!=0) {
+			for(int i=0;i<s.height;i++) {
+				int cell = Math::fast_ftoi(Math::floor((mtx.affine_inverse().xform(Vector2(0,i)).y-snap_offset.y)/snap_step.y));
+				if (i==0)
+					last_cell=cell;
+				if (last_cell!=cell)
+					uv_edit_draw->draw_line(Point2(0,i),Point2(s.width,i),Color(0.3,0.7,1,0.3));
+				last_cell=cell;
+			}
+		}
+	}
+
 	DVector<Vector2> uvs = node->get_uv();
 	Ref<Texture> handle = get_icon("EditorHandle","EditorIcons");
 
@@ -720,8 +785,27 @@ void Polygon2DEditor::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("_uv_input"),&Polygon2DEditor::_uv_input);
 	ObjectTypeDB::bind_method(_MD("_uv_scroll_changed"),&Polygon2DEditor::_uv_scroll_changed);
 	ObjectTypeDB::bind_method(_MD("_node_removed"),&Polygon2DEditor::_node_removed);
+	ObjectTypeDB::bind_method(_MD("_set_use_snap"),&Polygon2DEditor::_set_use_snap);
+	ObjectTypeDB::bind_method(_MD("_set_show_grid"),&Polygon2DEditor::_set_show_grid);
+	ObjectTypeDB::bind_method(_MD("_set_snap_off_x"),&Polygon2DEditor::_set_snap_off_x);
+	ObjectTypeDB::bind_method(_MD("_set_snap_off_y"),&Polygon2DEditor::_set_snap_off_y);
+	ObjectTypeDB::bind_method(_MD("_set_snap_step_x"),&Polygon2DEditor::_set_snap_step_x);
+	ObjectTypeDB::bind_method(_MD("_set_snap_step_y"),&Polygon2DEditor::_set_snap_step_y);
+
 
+}
 
+inline float _snap_scalar(float p_offset, float p_step, float p_target) {
+	return p_step != 0 ? Math::stepify(p_target - p_offset, p_step) + p_offset : p_target;
+}
+
+Vector2 Polygon2DEditor::snap_point(Vector2 p_target) const {
+	if (use_snap) {
+		p_target.x = _snap_scalar(snap_offset.x*uv_draw_zoom-uv_draw_ofs.x, snap_step.x*uv_draw_zoom, p_target.x);
+		p_target.y = _snap_scalar(snap_offset.y*uv_draw_zoom-uv_draw_ofs.y, snap_step.y*uv_draw_zoom, p_target.y);
+	}
+
+	return p_target;
 }
 
 Polygon2DEditor::Polygon2DEditor(EditorNode *p_editor) {
@@ -731,6 +815,10 @@ Polygon2DEditor::Polygon2DEditor(EditorNode *p_editor) {
 	editor=p_editor;
 	undo_redo = editor->get_undo_redo();
 
+	snap_step=Vector2(10,10);
+	use_snap=false;
+	snap_show_grid=false;
+
 	add_child( memnew( VSeparator ));
 	button_create = memnew( ToolButton );
 	add_child(button_create);
@@ -800,9 +888,72 @@ Polygon2DEditor::Polygon2DEditor(EditorNode *p_editor) {
 	uv_menu->get_popup()->add_separator();
 	uv_menu->get_popup()->add_item("Clear UV",UVEDIT_UV_CLEAR);
 	uv_menu->get_popup()->connect("item_pressed",this,"_menu_option");
+
+	uv_mode_hb->add_child( memnew( VSeparator ));
+
+	b_snap_enable = memnew( ToolButton );
+	uv_mode_hb->add_child(b_snap_enable);
+	b_snap_enable->set_text("Snap");
+	b_snap_enable->set_focus_mode(FOCUS_NONE);
+	b_snap_enable->set_toggle_mode(true);
+	b_snap_enable->set_pressed(use_snap);
+	b_snap_enable->set_tooltip("Enable Snap");
+	b_snap_enable->connect("toggled",this,"_set_use_snap");
+
+	b_snap_grid = memnew( ToolButton );
+	uv_mode_hb->add_child(b_snap_grid);
+	b_snap_grid->set_text("Grid");
+	b_snap_grid->set_focus_mode(FOCUS_NONE);
+	b_snap_grid->set_toggle_mode(true);
+	b_snap_grid->set_pressed(snap_show_grid);
+	b_snap_grid->set_tooltip("Show Grid");
+	b_snap_grid->connect("toggled",this,"_set_show_grid");
+
+	uv_mode_hb->add_child( memnew( VSeparator ));
+	uv_mode_hb->add_child( memnew( Label("Grid Offset:") ) );
+
+	SpinBox *sb_off_x = memnew( SpinBox );
+	sb_off_x->set_min(-256);
+	sb_off_x->set_max(256);
+	sb_off_x->set_step(1);
+	sb_off_x->set_val(snap_offset.x);
+	sb_off_x->set_suffix("px");
+	sb_off_x->connect("value_changed", this, "_set_snap_off_x");
+	uv_mode_hb->add_child(sb_off_x);
+
+	SpinBox *sb_off_y = memnew( SpinBox );
+	sb_off_y->set_min(-256);
+	sb_off_y->set_max(256);
+	sb_off_y->set_step(1);
+	sb_off_y->set_val(snap_offset.y);
+	sb_off_y->set_suffix("px");
+	sb_off_y->connect("value_changed", this, "_set_snap_off_y");
+	uv_mode_hb->add_child(sb_off_y);
+
+	uv_mode_hb->add_child( memnew( VSeparator ));
+	uv_mode_hb->add_child( memnew( Label("Grid Step:") ) );
+
+	SpinBox *sb_step_x = memnew( SpinBox );
+	sb_step_x->set_min(-256);
+	sb_step_x->set_max(256);
+	sb_step_x->set_step(1);
+	sb_step_x->set_val(snap_step.x);
+	sb_step_x->set_suffix("px");
+	sb_step_x->connect("value_changed", this, "_set_snap_step_x");
+	uv_mode_hb->add_child(sb_step_x);
+
+	SpinBox *sb_step_y = memnew( SpinBox );
+	sb_step_y->set_min(-256);
+	sb_step_y->set_max(256);
+	sb_step_y->set_step(1);
+	sb_step_y->set_val(snap_step.y);
+	sb_step_y->set_suffix("px");
+	sb_step_y->connect("value_changed", this, "_set_snap_step_y");
+	uv_mode_hb->add_child(sb_step_y);
+
 	uv_mode_hb->add_child( memnew( VSeparator ));
 	uv_icon_zoom = memnew( TextureFrame );
-	uv_main_hb->add_child( uv_icon_zoom );
+	uv_mode_hb->add_child( uv_icon_zoom );
 	uv_zoom = memnew( HSlider );
 	uv_zoom->set_min(0.01);
 	uv_zoom->set_max(4);
diff --git a/tools/editor/plugins/polygon_2d_editor_plugin.h b/tools/editor/plugins/polygon_2d_editor_plugin.h
index 8f807cb7e8..0939c44264 100644
--- a/tools/editor/plugins/polygon_2d_editor_plugin.h
+++ b/tools/editor/plugins/polygon_2d_editor_plugin.h
@@ -41,6 +41,8 @@ class Polygon2DEditor : public HBoxContainer {
 	UVMode uv_mode;
 	AcceptDialog *uv_edit;
 	ToolButton *uv_button[4];
+	ToolButton *b_snap_enable;
+	ToolButton *b_snap_grid;
 	Control *uv_edit_draw;
 	HSlider *uv_zoom;
 	SpinBox *uv_zoom_value;
@@ -78,6 +80,11 @@ class Polygon2DEditor : public HBoxContainer {
 	Vector<Vector2> wip;
 	bool wip_active;
 
+	bool use_snap;
+	bool snap_show_grid;
+	Vector2 snap_offset;
+	Vector2 snap_step;
+
 	void _uv_scroll_changed(float);
 	void _uv_input(const InputEvent& p_input);
 	void _uv_draw();
@@ -86,10 +93,20 @@ class Polygon2DEditor : public HBoxContainer {
 	void _canvas_draw();
 	void _menu_option(int p_option);
 
+	void _set_use_snap(bool p_use);
+	void _set_show_grid(bool p_show);
+	void _set_snap_off_x(float p_val);
+	void _set_snap_off_y(float p_val);
+	void _set_snap_step_x(float p_val);
+	void _set_snap_step_y(float p_val);
+
 protected:
 	void _notification(int p_what);
 	void _node_removed(Node *p_node);
 	static void _bind_methods();
+
+	Vector2 snap_point(Vector2 p_target) const;
+
 public:
 
 	bool forward_input_event(const InputEvent& p_event);
diff --git a/tools/editor/plugins/script_editor_plugin.cpp b/tools/editor/plugins/script_editor_plugin.cpp
index 3ef240e74c..bd0f580a34 100644
--- a/tools/editor/plugins/script_editor_plugin.cpp
+++ b/tools/editor/plugins/script_editor_plugin.cpp
@@ -211,7 +211,6 @@ void ScriptEditorQuickOpen::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("_confirmed"),&ScriptEditorQuickOpen::_confirmed);
 	ObjectTypeDB::bind_method(_MD("_sbox_input"),&ScriptEditorQuickOpen::_sbox_input);
 
-
 	ADD_SIGNAL(MethodInfo("goto_line",PropertyInfo(Variant::INT,"line")));
 
 }
@@ -547,6 +546,10 @@ void ScriptEditor::_show_debugger(bool p_show) {
 
 }
 
+void ScriptEditor::_script_created(Ref<Script> p_script) {
+	editor->push_item(p_script.operator->());
+}
+
 void ScriptEditor::_goto_script_line2(int p_line) {
 
 	int selected = tab_container->get_current_tab();
@@ -574,7 +577,7 @@ void ScriptEditor::_close_current_tab() {
 	int selected = tab_container->get_current_tab();
 	if (selected<0 || selected>=tab_container->get_child_count())
 		return;
-
+	
 	ScriptTextEditor *current = tab_container->get_child(selected)->cast_to<ScriptTextEditor>();
 	if (!current)
 		return;
@@ -753,7 +756,6 @@ void ScriptEditor::_menu_option(int p_option) {
 
 
 	if (p_option==FILE_OPEN) {
-
 		editor->open_resource("Script");
 		return;
 	}
@@ -766,8 +768,11 @@ void ScriptEditor::_menu_option(int p_option) {
 		return;
 
 	switch(p_option) {
+		case FILE_NEW: {
+			script_create_dialog->config("Node", ".gd");
+			script_create_dialog->popup_centered(Size2(300, 300));
+		} break;
 		case FILE_SAVE: {
-
 			if (!_test_script_times_on_disk())
 				return;
 			editor->save_resource( current->get_edited_script() );
@@ -1101,6 +1106,7 @@ void ScriptEditor::_menu_option(int p_option) {
 			int line=current->get_text_edit()->cursor_get_line();
 			bool dobreak = !current->get_text_edit()->is_line_set_as_breakpoint(line);
 			current->get_text_edit()->set_line_as_breakpoint(line,dobreak);
+			get_debugger()->set_breakpoint(current->get_edited_script()->get_path(),line+1,dobreak);
 		} break;
 		case DEBUG_NEXT: {
 
@@ -1418,6 +1424,7 @@ void ScriptEditor::_bind_methods() {
 	ObjectTypeDB::bind_method("_update_script_names",&ScriptEditor::_update_script_names);
 	ObjectTypeDB::bind_method("_tree_changed",&ScriptEditor::_tree_changed);
 	ObjectTypeDB::bind_method("_script_selected",&ScriptEditor::_script_selected);
+	ObjectTypeDB::bind_method("_script_created",&ScriptEditor::_script_created);
 	ObjectTypeDB::bind_method("_script_split_dragged",&ScriptEditor::_script_split_dragged);
 }
 
@@ -1802,6 +1809,7 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) {
 	file_menu = memnew( MenuButton );
 	menu_hb->add_child(file_menu);
 	file_menu->set_text("File");
+	file_menu->get_popup()->add_item("New",FILE_NEW);
 	file_menu->get_popup()->add_item("Open",FILE_OPEN);
 	file_menu->get_popup()->add_separator();
 	file_menu->get_popup()->add_item("Save",FILE_SAVE,KEY_MASK_ALT|KEY_MASK_CMD|KEY_S);
@@ -1898,6 +1906,10 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) {
 	add_child(erase_tab_confirm);
 	erase_tab_confirm->connect("confirmed", this,"_close_current_tab");
 
+	script_create_dialog = memnew(ScriptCreateDialog);
+	script_create_dialog->set_title("Create Script");
+	add_child(script_create_dialog);
+	script_create_dialog->connect("script_created", this, "_script_created");
 
 	goto_line_dialog = memnew(GotoLineDialog);
 	add_child(goto_line_dialog);
diff --git a/tools/editor/plugins/script_editor_plugin.h b/tools/editor/plugins/script_editor_plugin.h
index 0dd152cb25..e635a1974b 100644
--- a/tools/editor/plugins/script_editor_plugin.h
+++ b/tools/editor/plugins/script_editor_plugin.h
@@ -30,6 +30,7 @@
 #define SCRIPT_EDITOR_PLUGIN_H
 
 #include "tools/editor/editor_plugin.h"
+#include "tools/editor/script_create_dialog.h"
 #include "scene/gui/tab_container.h"
 #include "scene/gui/text_edit.h"
 #include "scene/gui/menu_button.h"
@@ -115,7 +116,7 @@ class ScriptEditor : public VBoxContainer {
 
 	EditorNode *editor;
 	enum {
-
+		FILE_NEW,
 		FILE_OPEN,
 		FILE_SAVE,
 		FILE_SAVE_AS,
@@ -167,6 +168,7 @@ class ScriptEditor : public VBoxContainer {
 	FindReplaceDialog *find_replace_dialog;
 	GotoLineDialog *goto_line_dialog;
 	ConfirmationDialog *erase_tab_confirm;
+	ScriptCreateDialog *script_create_dialog;
 	ScriptEditorDebugger* debugger;
 	ToolButton *scripts_visible;
 
@@ -207,6 +209,7 @@ class ScriptEditor : public VBoxContainer {
 	void _breaked(bool p_breaked,bool p_can_debug);
 	void _show_debugger(bool p_show);
 	void _update_window_menu();
+	void _script_created(Ref<Script> p_script);
 
 	void _editor_settings_changed();
 	void _autosave_scripts();
@@ -250,6 +253,8 @@ public:
 	void set_window_layout(Ref<ConfigFile> p_layout);
 	void get_window_layout(Ref<ConfigFile> p_layout);
 
+	ScriptEditorDebugger *get_debugger() { return debugger; }
+
 	ScriptEditor(EditorNode *p_editor);
 	~ScriptEditor();
 };
diff --git a/tools/editor/plugins/shader_graph_editor_plugin.cpp b/tools/editor/plugins/shader_graph_editor_plugin.cpp
index 03fcbffa24..684e7e32ef 100644
--- a/tools/editor/plugins/shader_graph_editor_plugin.cpp
+++ b/tools/editor/plugins/shader_graph_editor_plugin.cpp
@@ -29,6 +29,7 @@
 #include "shader_graph_editor_plugin.h"
 
 
+#include "scene/gui/check_box.h"
 #include "scene/gui/menu_button.h"
 #include "scene/gui/panel.h"
 #include "spatial_editor_plugin.h"
@@ -454,43 +455,43 @@ void GraphCurveMapEdit::_plot_curve(const Vector2& p_a,const Vector2& p_b,const
 	d3 = d * d * d;
 
 	/* construct a temporary matrix for determining the forward differencing deltas */
-	tmp2[0][0] = 0;     tmp2[0][1] = 0;     tmp2[0][2] = 0;    tmp2[0][3] = 1;
-	tmp2[1][0] = d3;    tmp2[1][1] = d2;    tmp2[1][2] = d;    tmp2[1][3] = 0;
-	tmp2[2][0] = 6*d3;  tmp2[2][1] = 2*d2;  tmp2[2][2] = 0;    tmp2[2][3] = 0;
-	tmp2[3][0] = 6*d3;  tmp2[3][1] = 0;     tmp2[3][2] = 0;    tmp2[3][3] = 0;
+	tmp2[0][0] = 0;		 tmp2[0][1] = 0;		 tmp2[0][2] = 0;		tmp2[0][3] = 1;
+	tmp2[1][0] = d3;		tmp2[1][1] = d2;		tmp2[1][2] = d;		tmp2[1][3] = 0;
+	tmp2[2][0] = 6*d3;  tmp2[2][1] = 2*d2;  tmp2[2][2] = 0;		tmp2[2][3] = 0;
+	tmp2[3][0] = 6*d3;  tmp2[3][1] = 0;		 tmp2[3][2] = 0;		tmp2[3][3] = 0;
 
 	/* compose the basis and geometry matrices */
 
 	static const float CR_basis[4][4] =
 	{
-	  { -0.5,  1.5, -1.5,  0.5 },
-	  {  1.0, -2.5,  2.0, -0.5 },
-	  { -0.5,  0.0,  0.5,  0.0 },
-	  {  0.0,  1.0,  0.0,  0.0 },
+		{ -0.5,  1.5, -1.5,  0.5 },
+		{  1.0, -2.5,  2.0, -0.5 },
+		{ -0.5,  0.0,  0.5,  0.0 },
+		{  0.0,  1.0,  0.0,  0.0 },
 	};
 
 	for (i = 0; i < 4; i++)
-	    {
-	      for (j = 0; j < 4; j++)
+	{
+		for (j = 0; j < 4; j++)
 		{
-		  tmp1[i][j] = (CR_basis[i][0] * geometry[0][j] +
-			      CR_basis[i][1] * geometry[1][j] +
-			      CR_basis[i][2] * geometry[2][j] +
-			      CR_basis[i][3] * geometry[3][j]);
+			tmp1[i][j] = (CR_basis[i][0] * geometry[0][j] +
+					CR_basis[i][1] * geometry[1][j] +
+					CR_basis[i][2] * geometry[2][j] +
+					CR_basis[i][3] * geometry[3][j]);
 		}
-	    }
+	}
 	/* compose the above results to get the deltas matrix */
 
 	for (i = 0; i < 4; i++)
-	    {
-	      for (j = 0; j < 4; j++)
+	{
+		for (j = 0; j < 4; j++)
 		{
-		  deltas[i][j] = (tmp2[i][0] * tmp1[0][j] +
-			      tmp2[i][1] * tmp1[1][j] +
-			      tmp2[i][2] * tmp1[2][j] +
-			      tmp2[i][3] * tmp1[3][j]);
+			deltas[i][j] = (tmp2[i][0] * tmp1[0][j] +
+					tmp2[i][1] * tmp1[1][j] +
+					tmp2[i][2] * tmp1[2][j] +
+					tmp2[i][3] * tmp1[3][j]);
 		}
-	    }
+	}
 
 
 	/* extract the x deltas */
@@ -509,15 +510,15 @@ void GraphCurveMapEdit::_plot_curve(const Vector2& p_a,const Vector2& p_b,const
 	lastx = CLAMP (x, 0, xmax);
 	lasty = CLAMP (y, 0, ymax);
 
-/*	if (fix255)
-	{
-		cd->curve[cd->outline][lastx] = lasty;
-	}
-	else
-	{
-		cd->curve_ptr[cd->outline][lastx] = lasty;
-		if(gb_debug) printf("bender_plot_curve xmax:%d ymax:%d\n", (int)xmax, (int)ymax);
-	}
+	/*	if (fix255)
+		{
+				cd->curve[cd->outline][lastx] = lasty;
+		}
+		else
+		{
+				cd->curve_ptr[cd->outline][lastx] = lasty;
+				if(gb_debug) printf("bender_plot_curve xmax:%d ymax:%d\n", (int)xmax, (int)ymax);
+		}
 */
 	/* loop over the curve */
 	for (i = 0; i < ntimes; i++)
@@ -590,9 +591,9 @@ void GraphCurveMapEdit::_notification(int p_what){
 			}
 
 			/*if (i==-1 && prev.offset==next.offset) {
-				prev=next;
-				continue;
-			}*/
+								prev=next;
+								continue;
+						}*/
 
 			_plot_curve(prev2,prev,next,next2);
 
@@ -608,10 +609,10 @@ void GraphCurveMapEdit::_notification(int p_what){
 			draw_rect(Rect2( Vector2(points[i].offset,1.0-points[i].height)*get_size()-Vector2(2,2),Vector2(5,5)),col);
 		}
 
-/*		if (grabbed!=-1) {
+		/*		if (grabbed!=-1) {
 
-			draw_rect(Rect2(total_w+3,0,h,h),points[grabbed].color);
-		}
+						draw_rect(Rect2(total_w+3,0,h,h),points[grabbed].color);
+				}
 */
 		if (has_focus()) {
 
@@ -840,6 +841,7 @@ void ShaderGraphView::_xform_input_changed(int p_id, Node *p_button){
 	ped_popup->set_pos(tb->get_global_pos()+Vector2(0,tb->get_size().height));
 	ped_popup->set_size(tb->get_size());
 	edited_id=p_id;
+	edited_def=-1;
 	ped_popup->edit(NULL,"",Variant::TRANSFORM,graph->xform_input_node_get_value(type,p_id),PROPERTY_HINT_NONE,"");
 	ped_popup->popup();
 
@@ -850,6 +852,7 @@ void ShaderGraphView::_xform_const_changed(int p_id, Node *p_button){
 	ped_popup->set_pos(tb->get_global_pos()+Vector2(0,tb->get_size().height));
 	ped_popup->set_size(tb->get_size());
 	edited_id=p_id;
+	edited_def=-1;
 	ped_popup->edit(NULL,"",Variant::TRANSFORM,graph->xform_const_node_get_value(type,p_id),PROPERTY_HINT_NONE,"");
 	ped_popup->popup();
 
@@ -879,6 +882,35 @@ void ShaderGraphView::_cube_input_change(int p_id){
 
 void ShaderGraphView::_variant_edited() {
 
+	if (edited_def != -1) {
+
+		Variant v = ped_popup->get_variant();
+		Variant v2 = graph->default_get_value(type,edited_id,edited_def);
+		if (v2.get_type() == Variant::NIL)
+			switch (v.get_type()) {
+			case Variant::VECTOR3:
+				v2=Vector3();
+				break;
+			case Variant::REAL:
+				v2=0.0;
+				break;
+			case Variant::TRANSFORM:
+				v2=Transform();
+				break;
+			case Variant::COLOR:
+				v2=Color();
+				break;
+			}
+		UndoRedo *ur=EditorNode::get_singleton()->get_undo_redo();
+		ur->create_action("Change default value");
+		ur->add_do_method(graph.ptr(),"default_set_value",type,edited_id,edited_def, v);
+		ur->add_undo_method(graph.ptr(),"default_set_value",type,edited_id,edited_def, v2);
+		ur->add_do_method(this,"_update_graph");
+		ur->add_undo_method(this,"_update_graph");
+		ur->commit_action();
+		return;
+	}
+
 	if (graph->node_get_type(type,edited_id)==ShaderGraph::NODE_XFORM_CONST) {
 
 		UndoRedo *ur=EditorNode::get_singleton()->get_undo_redo();
@@ -1043,6 +1075,7 @@ void ShaderGraphView::_tex_edited(int p_id,Node* p_button) {
 	ped_popup->set_pos(tb->get_global_pos()+Vector2(0,tb->get_size().height));
 	ped_popup->set_size(tb->get_size());
 	edited_id=p_id;
+	edited_def=-1;
 	ped_popup->edit(NULL,"",Variant::OBJECT,graph->texture_input_node_get_value(type,p_id),PROPERTY_HINT_RESOURCE_TYPE,"Texture");
 }
 
@@ -1052,6 +1085,7 @@ void ShaderGraphView::_cube_edited(int p_id,Node* p_button) {
 	ped_popup->set_pos(tb->get_global_pos()+Vector2(0,tb->get_size().height));
 	ped_popup->set_size(tb->get_size());
 	edited_id=p_id;
+	edited_def=-1;
 	ped_popup->edit(NULL,"",Variant::OBJECT,graph->cubemap_input_node_get_value(type,p_id),PROPERTY_HINT_RESOURCE_TYPE,"CubeMap");
 }
 
@@ -1156,14 +1190,24 @@ void ShaderGraphView::_node_removed(int p_id) {
 
 }
 
+void ShaderGraphView::_begin_node_move()
+{
+	UndoRedo *ur=EditorNode::get_singleton()->get_undo_redo();
+	ur->create_action("Move Shader Graph Node");
+}
+
 void ShaderGraphView::_node_moved(const Vector2& p_from, const Vector2& p_to,int p_id) {
 
 
 	ERR_FAIL_COND(!node_map.has(p_id));
 	UndoRedo *ur=EditorNode::get_singleton()->get_undo_redo();
-	ur->create_action("Move Shader Graph Node");
 	ur->add_do_method(this,"_move_node",p_id,p_to);
 	ur->add_undo_method(this,"_move_node",p_id,p_from);
+}
+
+void ShaderGraphView::_end_node_move()
+{
+	UndoRedo *ur=EditorNode::get_singleton()->get_undo_redo();
 	ur->commit_action();
 }
 
@@ -1174,860 +1218,1244 @@ void ShaderGraphView::_move_node(int p_id,const Vector2& p_to) {
 	graph->node_set_pos(type,p_id,p_to);
 }
 
+void ShaderGraphView::_duplicate_nodes_request()
+{
+	Array s_id;
+
+	for(Map<int,GraphNode*>::Element *E=node_map.front();E;E=E->next()) {
+		ShaderGraph::NodeType t=graph->node_get_type(type, E->key());
+		if (t==ShaderGraph::NODE_OUTPUT || t==ShaderGraph::NODE_INPUT)
+			continue;
+		GraphNode *gn = E->get();
+		if (gn && gn->is_selected())
+			s_id.push_back(E->key());
+	}
 
-void ShaderGraphView::_create_node(int p_id) {
-
-
-	GraphNode *gn = memnew( GraphNode );
-	gn->set_show_close_button(true);
-	Color typecol[4]={
-		Color(0.9,0.4,1),
-		Color(0.8,1,0.2),
-		Color(1,0.2,0.2),
-		Color(0,1,1)
-	};
-
-
-	switch(graph->node_get_type(type,p_id)) {
-
-		case ShaderGraph::NODE_INPUT: {
+	if (s_id.size()==0)
+		return;
 
-			gn->set_title("Input");
+	UndoRedo *ur=EditorNode::get_singleton()->get_undo_redo();
+	ur->create_action("Duplicate Graph Node(s)");
+	ur->add_do_method(this,"_duplicate_nodes",s_id);
+	List<int> n_ids = graph->generate_ids(type, s_id.size());
+	for (List<int>::Element *E=n_ids.front();E;E=E->next())
+		ur->add_undo_method(graph.ptr(),"node_remove",type,E->get());
+	ur->add_do_method(this,"_update_graph");
+	ur->add_undo_method(this,"_update_graph");
+	ur->commit_action();
 
-			List<ShaderGraph::SlotInfo> si;
-			ShaderGraph::get_input_output_node_slot_info(graph->get_mode(),type,&si);
+}
 
-			int idx=0;
-			for (List<ShaderGraph::SlotInfo>::Element *E=si.front();E;E=E->next()) {
-				ShaderGraph::SlotInfo& s=E->get();
-				if (s.dir==ShaderGraph::SLOT_IN) {
+void ShaderGraphView::_duplicate_nodes(const Array &p_nodes)
+{
+	List<int> n = List<int>();
+	for (int i=0; i<p_nodes.size();i++)
+		n.push_back(p_nodes.get(i));
+	graph->duplicate_nodes(type, n);
+	call_deferred("_update_graph");
+}
 
-					Label *l= memnew( Label );
-					l->set_text(s.name);
-					l->set_align(Label::ALIGN_RIGHT);
-					gn->add_child(l);
-					gn->set_slot(idx,false,0,Color(),true,s.type,typecol[s.type]);
-					idx++;
-				}
-			}
+void ShaderGraphView::_delete_nodes_request()
+{
+	List<int> s_id=List<int>();
+
+	for(Map<int,GraphNode*>::Element *E=node_map.front();E;E=E->next()) {
+		ShaderGraph::NodeType t=graph->node_get_type(type, E->key());
+		if (t==ShaderGraph::NODE_OUTPUT)
+			continue;
+		GraphNode *gn = E->get();
+		if (gn && gn->is_selected())
+			s_id.push_back(E->key());
+	}
 
-		} break; // all inputs (case Shader type dependent)
-		case ShaderGraph::NODE_SCALAR_CONST: {
-			gn->set_title("Scalar");
-			SpinBox *sb = memnew( SpinBox );
-			sb->set_min(-100000);
-			sb->set_max(100000);
-			sb->set_step(0.001);
-			sb->set_val(graph->scalar_const_node_get_value(type,p_id));
-			sb->connect("value_changed",this,"_scalar_const_changed",varray(p_id));
-			gn->add_child(sb);
-			gn->set_slot(0,false,0,Color(),true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
-
-		} break; //scalar constant
-		case ShaderGraph::NODE_VEC_CONST: {
-
-			gn->set_title("Vector");
-			Array v3p(true);
-			for(int i=0;i<3;i++) {
-				HBoxContainer *hbc = memnew( HBoxContainer );
-				Label *l = memnew( Label );
-				l->set_text(String::chr('X'+i));
-				hbc->add_child(l);
-				SpinBox *sb = memnew( SpinBox );
-				sb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-				sb->set_min(-100000);
-				sb->set_max(100000);
-				sb->set_step(0.001);
-				sb->set_val(graph->vec_const_node_get_value(type,p_id)[i]);
-				sb->connect("value_changed",this,"_vec_const_changed",varray(p_id,v3p));
-				v3p.push_back(sb);
-				hbc->add_child(sb);
-				gn->add_child(hbc);
-			}
-			gn->set_slot(0,false,0,Color(),true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
+	if (s_id.size()==0)
+		return;
 
-		} break; //vec3 constant
-		case ShaderGraph::NODE_RGB_CONST: {
+	UndoRedo *ur=EditorNode::get_singleton()->get_undo_redo();
+	ur->create_action("Delete Shader Graph Node(s)");
 
-			gn->set_title("Color");
-			ColorPickerButton *cpb = memnew( ColorPickerButton );
-			cpb->set_color(graph->rgb_const_node_get_value(type,p_id));
-			cpb->connect("color_changed",this,"_rgb_const_changed",varray(p_id));
-			gn->add_child(cpb);
-			Label *l = memnew( Label );
-			l->set_text("RGB");
-			l->set_align(Label::ALIGN_RIGHT);
-			gn->add_child(l);
-			l = memnew( Label );
-			l->set_text("Alpha");
-			l->set_align(Label::ALIGN_RIGHT);
-			gn->add_child(l);
-
-			gn->set_slot(1,false,0,Color(),true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
-			gn->set_slot(2,false,0,Color(),true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
-
-		} break; //rgb constant (shows a color picker instead)
-		case ShaderGraph::NODE_XFORM_CONST: {
-			gn->set_title("XForm");
-			ToolButton *edit = memnew( ToolButton );
-			edit->set_text("edit..");
-			edit->connect("pressed",this,"_xform_const_changed",varray(p_id,edit));
-			gn->add_child(edit);
-			gn->set_slot(0,false,0,Color(),true,ShaderGraph::SLOT_TYPE_XFORM,typecol[ShaderGraph::SLOT_TYPE_XFORM]);
-
-		} break; // 4x4 matrix constant
-		case ShaderGraph::NODE_TIME: {
-
-			gn->set_title("Time");
-			Label *l = memnew( Label );
-			l->set_text("(s)");
-			l->set_align(Label::ALIGN_RIGHT);
-			gn->add_child(l);
-			gn->set_slot(0,false,0,Color(),true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
+	for (List<int>::Element *N=s_id.front();N;N=N->next()) {
+		ur->add_do_method(graph.ptr(),"node_remove",type,N->get());
+		ur->add_undo_method(graph.ptr(),"node_add",type,graph->node_get_type(type,N->get()),N->get());
+		ur->add_undo_method(graph.ptr(),"node_set_state",type,N->get(),graph->node_get_state(type,N->get()));
+		List<ShaderGraph::Connection> conns;
 
-		} break; // time in seconds
-		case ShaderGraph::NODE_SCREEN_TEX: {
+		graph->get_node_connections(type,&conns);
+		for(List<ShaderGraph::Connection>::Element *E=conns.front();E;E=E->next()) {
 
-			gn->set_title("ScreenTex");
-			HBoxContainer *hbc = memnew( HBoxContainer );
-			hbc->add_constant_override("separation",0);
-			hbc->add_child( memnew(Label("UV")));
-			hbc->add_spacer();
-			hbc->add_child( memnew(Label("RGB")));
-			gn->add_child(hbc);
-			gn->set_slot(0,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
-
-		} break; // screen texture sampler (takes UV) (only usable in fragment case Shader)
-		case ShaderGraph::NODE_SCALAR_OP: {
-
-			gn->set_title("ScalarOp");
-			static const char* op_name[ShaderGraph::SCALAR_MAX_OP]={
-				"Add",
-				"Sub",
-				"Mul",
-				"Div",
-				"Mod",
-				"Pow",
-				"Max",
-				"Min",
-				"Atan2"
-			};
-
-			OptionButton *ob = memnew( OptionButton );
-			for(int i=0;i<ShaderGraph::SCALAR_MAX_OP;i++) {
-
-				ob->add_item(op_name[i],i);
+			if (E->get().dst_id==N->get() || E->get().src_id==N->get()) {
+				ur->add_undo_method(graph.ptr(),"connect_node",type,E->get().src_id,E->get().src_slot,E->get().dst_id,E->get().dst_slot);
 			}
+		}
+	}
+	ur->add_do_method(this,"_update_graph");
+	ur->add_undo_method(this,"_update_graph");
+	ur->commit_action();
 
-			ob->select(graph->scalar_op_node_get_op(type,p_id));
-			ob->connect("item_selected",this,"_scalar_op_changed",varray(p_id));
-			gn->add_child(ob);
-
-			HBoxContainer *hbc = memnew( HBoxContainer );
-			hbc->add_constant_override("separation",0);
-			hbc->add_child( memnew(Label("a")));
-			hbc->add_spacer();
-			hbc->add_child( memnew(Label("out")));
-			gn->add_child(hbc);
-			gn->add_child( memnew(Label("b")));
-
-			gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR],true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
-			gn->set_slot(2,true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR],false,0,Color());
-
-
-		} break; // scalar vs scalar op (mul: { } break; add: { } break; div: { } break; etc)
-		case ShaderGraph::NODE_VEC_OP: {
-
-			gn->set_title("VecOp");
-			static const char* op_name[ShaderGraph::VEC_MAX_OP]={
-				"Add",
-				"Sub",
-				"Mul",
-				"Div",
-				"Mod",
-				"Pow",
-				"Max",
-				"Min",
-				"Cross"
-			};
-
-			OptionButton *ob = memnew( OptionButton );
-			for(int i=0;i<ShaderGraph::VEC_MAX_OP;i++) {
-
-				ob->add_item(op_name[i],i);
-			}
+}
 
-			ob->select(graph->vec_op_node_get_op(type,p_id));
-			ob->connect("item_selected",this,"_vec_op_changed",varray(p_id));
-			gn->add_child(ob);
+void ShaderGraphView::_default_changed(int p_id, Node *p_button, int p_param, int v_type, String p_hint)
+{
+	ToolButton *tb = p_button->cast_to<ToolButton>();
+	ped_popup->set_pos(tb->get_global_pos()+Vector2(0,tb->get_size().height));
+	ped_popup->set_size(tb->get_size());
+	edited_id=p_id;
+	edited_def=p_param;
+	Variant::Type vt = (Variant::Type)v_type;
+	Variant v = graph->default_get_value(type,p_id,edited_def);
+	int h=PROPERTY_HINT_NONE;
+	if (v.get_type() == Variant::NIL)
+		switch (vt) {
+		case Variant::VECTOR3:
+			v=Vector3();
+			break;
+		case Variant::REAL:
+			h=PROPERTY_HINT_RANGE;
+			v=0.0;
+			break;
+		case Variant::TRANSFORM:
+			v=Transform();
+			break;
+		case Variant::COLOR:
+			h=PROPERTY_HINT_COLOR_NO_ALPHA;
+			v=Color();
+			break;
+		}
 
-			HBoxContainer *hbc = memnew( HBoxContainer );
-			hbc->add_constant_override("separation",0);
-			hbc->add_child( memnew(Label("a")));
-			hbc->add_spacer();
-			hbc->add_child( memnew(Label("out")));
-			gn->add_child(hbc);
-			gn->add_child( memnew(Label("b")));
+	ped_popup->edit(NULL,"",vt,v,h,p_hint);
 
-			gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
-			gn->set_slot(2,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],false,0,Color());
+	ped_popup->popup();
+}
 
+ToolButton *ShaderGraphView::make_label(String text, Variant::Type v_type) {
+	ToolButton *l = memnew( ToolButton );
+	l->set_text(text);
+	l->set_text_align(ToolButton::ALIGN_LEFT);
+	l->add_style_override("hover", l->get_stylebox("normal", "ToolButton"));
+	l->add_style_override("pressed", l->get_stylebox("normal", "ToolButton"));
+	l->add_style_override("focus", l->get_stylebox("normal", "ToolButton"));
+	switch (v_type) {
+	case Variant::REAL:
+		l->set_icon(ped_popup->get_icon("Real", "EditorIcons"));
+		break;
+	case Variant::VECTOR3:
+		l->set_icon(ped_popup->get_icon("Vector", "EditorIcons"));
+		break;
+	case Variant::TRANSFORM:
+		l->set_icon(ped_popup->get_icon("Matrix", "EditorIcons"));
+		break;
+	case Variant::COLOR:
+		l->set_icon(ped_popup->get_icon("Color", "EditorIcons"));
+	}
+	return l;
+}
 
-		} break; // vec3 vs vec3 op (mul: { } break;ad: { } break;div: { } break;crossprod: { } break;etc)
-		case ShaderGraph::NODE_VEC_SCALAR_OP: {
+ToolButton *ShaderGraphView::make_editor(String text,GraphNode* gn,int p_id,int param,Variant::Type v_type, String p_hint) {
+	ToolButton *edit = memnew( ToolButton );
+	edit->set_text(text);
+	edit->set_text_align(ToolButton::ALIGN_LEFT);
+	edit->set_flat(false);
+	edit->add_style_override("normal", gn->get_stylebox("defaultframe", "GraphNode"));
+	edit->add_style_override("hover", gn->get_stylebox("defaultframe", "GraphNode"));
+	edit->add_style_override("pressed", gn->get_stylebox("defaultframe", "GraphNode"));
+	edit->add_style_override("focus", gn->get_stylebox("defaultfocus", "GraphNode"));
+	edit->connect("pressed",this,"_default_changed",varray(p_id,edit,param,v_type,p_hint));
+
+	switch (v_type) {
+	case Variant::REAL:
+		edit->set_icon(ped_popup->get_icon("Real", "EditorIcons"));
+		break;
+	case Variant::VECTOR3:
+		edit->set_icon(ped_popup->get_icon("Vector", "EditorIcons"));
+		break;
+	case Variant::TRANSFORM:
+		edit->set_icon(ped_popup->get_icon("Matrix", "EditorIcons"));
+		break;
+	case Variant::COLOR:
+		Image icon_color = Image(15,15,false,Image::FORMAT_RGB);
+		Color c = graph->default_get_value(type,p_id,param);
+		for (int x=1;x<14;x++)
+			for (int y=1;y<14;y++)
+				icon_color.put_pixel(x,y,c);
+		Ref<ImageTexture> t;
+		t.instance();
+		t->create_from_image(icon_color);
+		edit->set_icon(t);
+		break;
+	}
+	return edit;
+}
 
-			gn->set_title("VecScalarOp");
-			static const char* op_name[ShaderGraph::VEC_SCALAR_MAX_OP]={
-				"Mul",
-				"Div",
-				"Pow",
-			};
+void ShaderGraphView::_create_node(int p_id) {
 
-			OptionButton *ob = memnew( OptionButton );
-			for(int i=0;i<ShaderGraph::VEC_SCALAR_MAX_OP;i++) {
 
-				ob->add_item(op_name[i],i);
-			}
+	GraphNode *gn = memnew( GraphNode );
+	gn->set_show_close_button(true);
+	Color typecol[4]={
+		Color(0.9,0.4,1),
+		Color(0.8,1,0.2),
+		Color(1,0.2,0.2),
+		Color(0,1,1)
+	};
 
-			ob->select(graph->vec_scalar_op_node_get_op(type,p_id));
-			ob->connect("item_selected",this,"_vec_scalar_op_changed",varray(p_id));
-			gn->add_child(ob);
+	const String hint_spin = "-65536,65535,0.001";
+	const String hint_slider = "0.0,1.0,0.01,slider";
 
-			HBoxContainer *hbc = memnew( HBoxContainer );
-			hbc->add_constant_override("separation",0);
-			hbc->add_child( memnew(Label("a")));
-			hbc->add_spacer();
-			hbc->add_child( memnew(Label("out")));
-			gn->add_child(hbc);
-			gn->add_child( memnew(Label("b")));
 
-			gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
-			gn->set_slot(2,true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR],false,0,Color());
+	switch(graph->node_get_type(type,p_id)) {
 
+	case ShaderGraph::NODE_INPUT: {
 
-		} break; // vec3 vs scalar op (mul: { } break; add: { } break; div: { } break; etc)
-		case ShaderGraph::NODE_RGB_OP: {
+		gn->set_title("Input");
 
-			gn->set_title("RGB Op");
-			static const char* op_name[ShaderGraph::RGB_MAX_OP]={
-				"Screen",
-				"Difference",
-				"Darken",
-				"Lighten",
-				"Overlay",
-				"Dodge",
-				"Burn",
-				"SoftLight",
-				"HardLight"
-			};
+		List<ShaderGraph::SlotInfo> si;
+		ShaderGraph::get_input_output_node_slot_info(graph->get_mode(),type,&si);
 
-			OptionButton *ob = memnew( OptionButton );
-			for(int i=0;i<ShaderGraph::RGB_MAX_OP;i++) {
+		int idx=0;
+		for (List<ShaderGraph::SlotInfo>::Element *E=si.front();E;E=E->next()) {
+			ShaderGraph::SlotInfo& s=E->get();
+			if (s.dir==ShaderGraph::SLOT_IN) {
 
-				ob->add_item(op_name[i],i);
+				Label *l= memnew( Label );
+				l->set_text(s.name);
+				l->set_align(Label::ALIGN_RIGHT);
+				gn->add_child(l);
+				gn->set_slot(idx,false,0,Color(),true,s.type,typecol[s.type]);
+				idx++;
 			}
+		}
 
-			ob->select(graph->rgb_op_node_get_op(type,p_id));
-			ob->connect("item_selected",this,"_rgb_op_changed",varray(p_id));
-			gn->add_child(ob);
-
+	} break; // all inputs (case Shader type dependent)
+	case ShaderGraph::NODE_SCALAR_CONST: {
+		gn->set_title("Scalar");
+		SpinBox *sb = memnew( SpinBox );
+		sb->set_min(-100000);
+		sb->set_max(100000);
+		sb->set_step(0.001);
+		sb->set_val(graph->scalar_const_node_get_value(type,p_id));
+		sb->connect("value_changed",this,"_scalar_const_changed",varray(p_id));
+		gn->add_child(sb);
+		gn->set_slot(0,false,0,Color(),true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
+
+	} break; //scalar constant
+	case ShaderGraph::NODE_VEC_CONST: {
+
+		gn->set_title("Vector");
+		Array v3p(true);
+		for(int i=0;i<3;i++) {
 			HBoxContainer *hbc = memnew( HBoxContainer );
-			hbc->add_constant_override("separation",0);
-			hbc->add_child( memnew(Label("a")));
-			hbc->add_spacer();
-			hbc->add_child( memnew(Label("out")));
+			Label *l = memnew( Label );
+			l->set_text(String::chr('X'+i));
+			hbc->add_child(l);
+			SpinBox *sb = memnew( SpinBox );
+			sb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
+			sb->set_min(-100000);
+			sb->set_max(100000);
+			sb->set_step(0.001);
+			sb->set_val(graph->vec_const_node_get_value(type,p_id)[i]);
+			sb->connect("value_changed",this,"_vec_const_changed",varray(p_id,v3p));
+			v3p.push_back(sb);
+			hbc->add_child(sb);
 			gn->add_child(hbc);
-			gn->add_child( memnew(Label("b")));
+		}
+		gn->set_slot(0,false,0,Color(),true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
+
+	} break; //vec3 constant
+	case ShaderGraph::NODE_RGB_CONST: {
+
+		gn->set_title("Color");
+		ColorPickerButton *cpb = memnew( ColorPickerButton );
+		cpb->set_color(graph->rgb_const_node_get_value(type,p_id));
+		cpb->connect("color_changed",this,"_rgb_const_changed",varray(p_id));
+		gn->add_child(cpb);
+		Label *l = memnew( Label );
+		l->set_text("RGB");
+		l->set_align(Label::ALIGN_RIGHT);
+		gn->add_child(l);
+		l = memnew( Label );
+		l->set_text("Alpha");
+		l->set_align(Label::ALIGN_RIGHT);
+		gn->add_child(l);
+
+		gn->set_slot(1,false,0,Color(),true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
+		gn->set_slot(2,false,0,Color(),true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
+
+	} break; //rgb constant (shows a color picker instead)
+	case ShaderGraph::NODE_XFORM_CONST: {
+		gn->set_title("XForm");
+		ToolButton *edit = memnew( ToolButton );
+		edit->set_text("edit..");
+		edit->connect("pressed",this,"_xform_const_changed",varray(p_id,edit));
+		gn->add_child(edit);
+		gn->set_slot(0,false,0,Color(),true,ShaderGraph::SLOT_TYPE_XFORM,typecol[ShaderGraph::SLOT_TYPE_XFORM]);
+
+	} break; // 4x4 matrix constant
+	case ShaderGraph::NODE_TIME: {
+
+		gn->set_title("Time");
+		Label *l = memnew( Label );
+		l->set_text("(s)");
+		l->set_align(Label::ALIGN_RIGHT);
+		gn->add_child(l);
+		gn->set_slot(0,false,0,Color(),true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
+
+	} break; // time in seconds
+	case ShaderGraph::NODE_SCREEN_TEX: {
+
+		gn->set_title("ScreenTex");
+		HBoxContainer *hbc = memnew( HBoxContainer );
+		hbc->add_constant_override("separation",0);
+		if (!graph->is_slot_connected(type,p_id,0)) {
+			Vector3 v = graph->default_get_value(type, p_id, 0);
+			hbc->add_child(make_editor("UV: " + v,gn,p_id,0,Variant::VECTOR3));
+		} else {
+			hbc->add_child(make_label("UV",Variant::VECTOR3));
+		}
+		hbc->add_spacer();
+		hbc->add_child( memnew(Label("RGB")));
+		gn->add_child(hbc);
+		gn->set_slot(0,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
+
+	} break; // screen texture sampler (takes UV) (only usable in fragment case Shader)
+	case ShaderGraph::NODE_SCALAR_OP: {
+
+		gn->set_title("ScalarOp");
+		static const char* op_name[ShaderGraph::SCALAR_MAX_OP]={
+			"Add",
+			"Sub",
+			"Mul",
+			"Div",
+			"Mod",
+			"Pow",
+			"Max",
+			"Min",
+			"Atan2"
+		};
+
+		OptionButton *ob = memnew( OptionButton );
+		for(int i=0;i<ShaderGraph::SCALAR_MAX_OP;i++) {
+
+			ob->add_item(op_name[i],i);
+		}
 
-			gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
-			gn->set_slot(2,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],false,0,Color());
+		ob->select(graph->scalar_op_node_get_op(type,p_id));
+		ob->connect("item_selected",this,"_scalar_op_changed",varray(p_id));
+		gn->add_child(ob);
+
+		HBoxContainer *hbc = memnew( HBoxContainer );
+		hbc->add_constant_override("separation",0);
+		if (graph->is_slot_connected(type, p_id, 0)) {
+			hbc->add_child(make_label("a",Variant::REAL));
+		} else {
+			float v = graph->default_get_value(type,p_id,0);
+			hbc->add_child(make_editor(String("a: ")+Variant(v),gn,p_id,0,Variant::REAL,hint_spin));
+		}
+		hbc->add_spacer();
+		hbc->add_child( memnew(Label("out")));
+		gn->add_child(hbc);
+		if (graph->is_slot_connected(type, p_id, 1)) {
+			gn->add_child(make_label("b",Variant::REAL));
+		} else {
+			float v = graph->default_get_value(type,p_id,1);
+			gn->add_child(make_editor(String("b: ")+Variant(v),gn,p_id,1,Variant::REAL,hint_spin));
+		}
 
-		} break; // vec3 vs vec3 rgb op (with scalar amount): { } break; like brighten: { } break; darken: { } break; burn: { } break; dodge: { } break; multiply: { } break; etc.
-		case ShaderGraph::NODE_XFORM_MULT: {
+		gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR],true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
+		gn->set_slot(2,true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR],false,0,Color());
 
-			gn->set_title("XFMult");
-			HBoxContainer *hbc = memnew( HBoxContainer );
-			hbc->add_child( memnew(Label("a")));
-			hbc->add_spacer();
-			hbc->add_child( memnew(Label("out")));
-			gn->add_child(hbc);
-			gn->add_child( memnew(Label("b")));
 
-			gn->set_slot(0,true,ShaderGraph::SLOT_TYPE_XFORM,typecol[ShaderGraph::SLOT_TYPE_XFORM],true,ShaderGraph::SLOT_TYPE_XFORM,typecol[ShaderGraph::SLOT_TYPE_XFORM]);
-			gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_XFORM,typecol[ShaderGraph::SLOT_TYPE_XFORM],false,0,Color());
+	} break; // scalar vs scalar op (mul: { } break; add: { } break; div: { } break; etc)
+	case ShaderGraph::NODE_VEC_OP: {
 
+		gn->set_title("VecOp");
+		static const char* op_name[ShaderGraph::VEC_MAX_OP]={
+			"Add",
+			"Sub",
+			"Mul",
+			"Div",
+			"Mod",
+			"Pow",
+			"Max",
+			"Min",
+			"Cross"
+		};
 
-		} break; // mat4 x mat4
-		case ShaderGraph::NODE_XFORM_VEC_MULT: {
+		OptionButton *ob = memnew( OptionButton );
+		for(int i=0;i<ShaderGraph::VEC_MAX_OP;i++) {
 
-			gn->set_title("XFVecMult");
+			ob->add_item(op_name[i],i);
+		}
 
-			Button *button = memnew( Button("RotOnly"));
-			button->set_toggle_mode(true);
-			button->set_pressed(graph->xform_vec_mult_node_get_no_translation(type,p_id));
-			button->connect("toggled",this,"_xform_inv_rev_changed",varray(p_id));
+		ob->select(graph->vec_op_node_get_op(type,p_id));
+		ob->connect("item_selected",this,"_vec_op_changed",varray(p_id));
+		gn->add_child(ob);
+
+		HBoxContainer *hbc = memnew( HBoxContainer );
+		hbc->add_constant_override("separation",0);
+		if (graph->is_slot_connected(type, p_id, 0)) {
+			hbc->add_child(make_label("a",Variant::VECTOR3));
+		} else {
+			Vector3 v = graph->default_get_value(type,p_id,0);
+			hbc->add_child(make_editor(String("a: ")+v,gn,p_id,0,Variant::VECTOR3));
+		}
+		hbc->add_spacer();
+		hbc->add_child( memnew(Label("out")));
+		gn->add_child(hbc);
+		if (graph->is_slot_connected(type, p_id, 1)) {
+			gn->add_child(make_label("b",Variant::VECTOR3));
+		} else {
+			Vector3 v = graph->default_get_value(type,p_id,1);
+			gn->add_child(make_editor(String("b: ")+v,gn,p_id,1,Variant::VECTOR3));
+		}
 
-			gn->add_child(button);
+		gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
+		gn->set_slot(2,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],false,0,Color());
 
-			HBoxContainer *hbc = memnew( HBoxContainer );
-			hbc->add_constant_override("separation",0);
-			hbc->add_child( memnew(Label("xf")));
-			hbc->add_spacer();
-			Label *l = memnew(Label("out"));
-			l->set_align(Label::ALIGN_RIGHT);
-			hbc->add_child( l);
-			gn->add_child(hbc);
-			gn->add_child( memnew(Label("vec")));
 
-			gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_XFORM,typecol[ShaderGraph::SLOT_TYPE_XFORM],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
-			gn->set_slot(2,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],false,0,Color());
+	} break; // vec3 vs vec3 op (mul: { } break;ad: { } break;div: { } break;crossprod: { } break;etc)
+	case ShaderGraph::NODE_VEC_SCALAR_OP: {
 
-		} break;
-		case ShaderGraph::NODE_XFORM_VEC_INV_MULT: {
+		gn->set_title("VecScalarOp");
+		static const char* op_name[ShaderGraph::VEC_SCALAR_MAX_OP]={
+			"Mul",
+			"Div",
+			"Pow",
+		};
 
-			gn->set_title("XFVecInvMult");
+		OptionButton *ob = memnew( OptionButton );
+		for(int i=0;i<ShaderGraph::VEC_SCALAR_MAX_OP;i++) {
 
+			ob->add_item(op_name[i],i);
+		}
 
-			Button *button = memnew( Button("RotOnly"));
-			button->set_toggle_mode(true);
-			button->set_pressed(graph->xform_vec_mult_node_get_no_translation(type,p_id));
-			button->connect("toggled",this,"_xform_inv_rev_changed",varray(p_id));
+		ob->select(graph->vec_scalar_op_node_get_op(type,p_id));
+		ob->connect("item_selected",this,"_vec_scalar_op_changed",varray(p_id));
+		gn->add_child(ob);
+
+		HBoxContainer *hbc = memnew( HBoxContainer );
+		hbc->add_constant_override("separation",0);
+		if (graph->is_slot_connected(type, p_id, 0)) {
+			hbc->add_child(make_label("a",Variant::VECTOR3));
+		} else {
+			Vector3 v = graph->default_get_value(type,p_id,0);
+			hbc->add_child(make_editor(String("a: ")+v,gn,p_id,0,Variant::VECTOR3));
+		}
+		hbc->add_spacer();
+		hbc->add_child( memnew(Label("out")));
+		gn->add_child(hbc);
+
+		if (graph->is_slot_connected(type, p_id, 1)) {
+			gn->add_child(make_label("b",Variant::REAL));
+		} else {
+			float v = graph->default_get_value(type,p_id,1);
+			gn->add_child(make_editor(String("b: ")+Variant(v),gn,p_id,1,Variant::REAL,hint_spin));
+		}
+		gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
+		gn->set_slot(2,true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR],false,0,Color());
+
+
+	} break; // vec3 vs scalar op (mul: { } break; add: { } break; div: { } break; etc)
+	case ShaderGraph::NODE_RGB_OP: {
+
+		gn->set_title("RGB Op");
+		static const char* op_name[ShaderGraph::RGB_MAX_OP]={
+			"Screen",
+			"Difference",
+			"Darken",
+			"Lighten",
+			"Overlay",
+			"Dodge",
+			"Burn",
+			"SoftLight",
+			"HardLight"
+		};
+
+		OptionButton *ob = memnew( OptionButton );
+		for(int i=0;i<ShaderGraph::RGB_MAX_OP;i++) {
+
+			ob->add_item(op_name[i],i);
+		}
 
-			gn->add_child(button);
+		ob->select(graph->rgb_op_node_get_op(type,p_id));
+		ob->connect("item_selected",this,"_rgb_op_changed",varray(p_id));
+		gn->add_child(ob);
 
-			gn->add_child( memnew(Label("vec")));
-			HBoxContainer *hbc = memnew( HBoxContainer );
-			hbc->add_constant_override("separation",0);
-			hbc->add_child( memnew(Label("xf")));
-			hbc->add_spacer();
-			Label *l = memnew(Label("out"));
-			l->set_align(Label::ALIGN_RIGHT);
-			hbc->add_child( l);
-			gn->add_child(hbc);
+		HBoxContainer *hbc = memnew( HBoxContainer );
+		hbc->add_constant_override("separation",0);
+		if (graph->is_slot_connected(type, p_id, 0)) {
+			hbc->add_child(make_label("a",Variant::COLOR));
+		} else {
+			hbc->add_child(make_editor(String("a: "),gn,p_id,0,Variant::COLOR));
+		}
+		hbc->add_spacer();
+		hbc->add_child( memnew(Label("out")));
+		gn->add_child(hbc);
+		if (graph->is_slot_connected(type, p_id, 1)) {
+			gn->add_child(make_label("b",Variant::COLOR));
+		} else {
+			gn->add_child(make_editor(String("b: "),gn,p_id,1,Variant::COLOR));
+		}
 
-			gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],false,0,Color());
-			gn->set_slot(2,true,ShaderGraph::SLOT_TYPE_XFORM,typecol[ShaderGraph::SLOT_TYPE_XFORM],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
-
-
-		} break; // mat4 x vec3 inverse mult (with no-translation option)
-		case ShaderGraph::NODE_SCALAR_FUNC: {
-
-			gn->set_title("ScalarFunc");
-			static const char* func_name[ShaderGraph::SCALAR_MAX_FUNC]={
-				"Sin",
-				"Cos",
-				"Tan",
-				"ASin",
-				"ACos",
-				"ATan",
-				"SinH",
-				"CosH",
-				"TanH",
-				"Log",
-				"Exp",
-				"Sqrt",
-				"Abs",
-				"Sign",
-				"Floor",
-				"Round",
-				"Ceil",
-				"Frac",
-				"Satr",
-				"Neg"
-			};
-
-			OptionButton *ob = memnew( OptionButton );
-			for(int i=0;i<ShaderGraph::SCALAR_MAX_FUNC;i++) {
-
-				ob->add_item(func_name[i],i);
-			}
+		gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
+		gn->set_slot(2,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],false,0,Color());
 
-			ob->select(graph->scalar_func_node_get_function(type,p_id));
-			ob->connect("item_selected",this,"_scalar_func_changed",varray(p_id));
-			gn->add_child(ob);
+	} break; // vec3 vs vec3 rgb op (with scalar amount): { } break; like brighten: { } break; darken: { } break; burn: { } break; dodge: { } break; multiply: { } break; etc.
+	case ShaderGraph::NODE_XFORM_MULT: {
 
-			HBoxContainer *hbc = memnew( HBoxContainer );
-			hbc->add_child( memnew(Label("in")));
-			hbc->add_spacer();
-			hbc->add_child( memnew(Label("out")));
-			gn->add_child(hbc);
+		gn->set_title("XFMult");
+		HBoxContainer *hbc = memnew( HBoxContainer );
+		if (graph->is_slot_connected(type, p_id, 0)) {
+			hbc->add_child(make_label("a",Variant::TRANSFORM));
+		} else {
+			hbc->add_child(make_editor(String("a: edit..."),gn,p_id,0,Variant::TRANSFORM));
+		}
+		hbc->add_spacer();
+		hbc->add_child( memnew(Label("out")));
+		gn->add_child(hbc);
+		if (graph->is_slot_connected(type, p_id, 1)) {
+			gn->add_child(make_label("b",Variant::TRANSFORM));
+		} else {
+			gn->add_child(make_editor(String("b: edit..."),gn,p_id,1,Variant::TRANSFORM));
+		}
 
-			gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR],true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
+		gn->set_slot(0,true,ShaderGraph::SLOT_TYPE_XFORM,typecol[ShaderGraph::SLOT_TYPE_XFORM],true,ShaderGraph::SLOT_TYPE_XFORM,typecol[ShaderGraph::SLOT_TYPE_XFORM]);
+		gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_XFORM,typecol[ShaderGraph::SLOT_TYPE_XFORM],false,0,Color());
 
 
-		} break; // scalar function (sin: { } break; cos: { } break; etc)
-		case ShaderGraph::NODE_VEC_FUNC: {
+	} break; // mat4 x mat4
+	case ShaderGraph::NODE_XFORM_VEC_MULT: {
 
+		gn->set_title("XFVecMult");
 
+		CheckBox *button = memnew (CheckBox("RotOnly"));
+		button->set_pressed(graph->xform_vec_mult_node_get_no_translation(type,p_id));
+		button->connect("toggled",this,"_xform_inv_rev_changed",varray(p_id));
 
-			gn->set_title("VecFunc");
-			static const char* func_name[ShaderGraph::VEC_MAX_FUNC]={
-				"Normalize",
-				"Saturate",
-				"Negate",
-				"Reciprocal",
-				"RGB to HSV",
-				"HSV to RGB",
-			};
+		gn->add_child(button);
 
-			OptionButton *ob = memnew( OptionButton );
-			for(int i=0;i<ShaderGraph::VEC_MAX_FUNC;i++) {
+		HBoxContainer *hbc = memnew( HBoxContainer );
+		hbc->add_constant_override("separation",0);
+		if (graph->is_slot_connected(type, p_id, 0)) {
+			hbc->add_child(make_label("xf",Variant::TRANSFORM));
+		} else {
+			hbc->add_child(make_editor(String("xf: edit..."),gn,p_id,0,Variant::TRANSFORM));
+		}
+		hbc->add_spacer();
+		Label *l = memnew(Label("out"));
+		l->set_align(Label::ALIGN_RIGHT);
+		hbc->add_child( l);
+		gn->add_child(hbc);
+		if (graph->is_slot_connected(type, p_id, 1)) {
+			gn->add_child(make_label("a",Variant::VECTOR3));
+		} else {
+			Vector3 v = graph->default_get_value(type,p_id,1);
+			gn->add_child(make_editor(String("a: ")+v,gn,p_id,1,Variant::VECTOR3));
+		}
 
-				ob->add_item(func_name[i],i);
-			}
+		gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_XFORM,typecol[ShaderGraph::SLOT_TYPE_XFORM],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
+		gn->set_slot(2,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],false,0,Color());
 
-			ob->select(graph->vec_func_node_get_function(type,p_id));
-			ob->connect("item_selected",this,"_vec_func_changed",varray(p_id));
-			gn->add_child(ob);
+	} break;
+	case ShaderGraph::NODE_XFORM_VEC_INV_MULT: {
 
-			HBoxContainer *hbc = memnew( HBoxContainer );
-			hbc->add_constant_override("separation",0);
-			hbc->add_child( memnew(Label("in")));
-			hbc->add_spacer();
-			hbc->add_child( memnew(Label("out")));
-			gn->add_child(hbc);
+		gn->set_title("XFVecInvMult");
 
-			gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
 
-		} break; // vector function (normalize: { } break; negate: { } break; reciprocal: { } break; rgb2hsv: { } break; hsv2rgb: { } break; etc: { } break; etc)
-		case ShaderGraph::NODE_VEC_LEN: {
-			gn->set_title("VecLength");
-			HBoxContainer *hbc = memnew( HBoxContainer );
-			hbc->add_child( memnew(Label("in")));
-			hbc->add_spacer();
-			hbc->add_child( memnew(Label("len")));
-			gn->add_child(hbc);
+		CheckBox *button = memnew( CheckBox("RotOnly"));
+		button->set_pressed(graph->xform_vec_mult_node_get_no_translation(type,p_id));
+		button->connect("toggled",this,"_xform_inv_rev_changed",varray(p_id));
 
-			gn->set_slot(0,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
+		gn->add_child(button);
 
-		} break; // vec3 length
-		case ShaderGraph::NODE_DOT_PROD: {
+		if (graph->is_slot_connected(type, p_id, 0)) {
+			gn->add_child(make_label("a",Variant::VECTOR3));
+		} else {
+			Vector3 v = graph->default_get_value(type,p_id,0);
+			gn->add_child(make_editor(String("a: ")+v,gn,p_id,0,Variant::VECTOR3));
+		}
+		HBoxContainer *hbc = memnew( HBoxContainer );
+		hbc->add_constant_override("separation",0);
+		if (graph->is_slot_connected(type, p_id, 1)) {
+			hbc->add_child(make_label("xf", Variant::TRANSFORM));
+		} else {
+			hbc->add_child(make_editor(String("xf: edit..."),gn,p_id,1,Variant::TRANSFORM));
+		}
+		hbc->add_spacer();
+		Label *l = memnew(Label("out"));
+		l->set_align(Label::ALIGN_RIGHT);
+		hbc->add_child( l);
+		gn->add_child(hbc);
+
+		gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],false,0,Color());
+		gn->set_slot(2,true,ShaderGraph::SLOT_TYPE_XFORM,typecol[ShaderGraph::SLOT_TYPE_XFORM],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
+
+
+	} break; // mat4 x vec3 inverse mult (with no-translation option)
+	case ShaderGraph::NODE_SCALAR_FUNC: {
+
+		gn->set_title("ScalarFunc");
+		static const char* func_name[ShaderGraph::SCALAR_MAX_FUNC]={
+			"Sin",
+			"Cos",
+			"Tan",
+			"ASin",
+			"ACos",
+			"ATan",
+			"SinH",
+			"CosH",
+			"TanH",
+			"Log",
+			"Exp",
+			"Sqrt",
+			"Abs",
+			"Sign",
+			"Floor",
+			"Round",
+			"Ceil",
+			"Frac",
+			"Satr",
+			"Neg"
+		};
+
+		OptionButton *ob = memnew( OptionButton );
+		for(int i=0;i<ShaderGraph::SCALAR_MAX_FUNC;i++) {
+
+			ob->add_item(func_name[i],i);
+		}
 
-			gn->set_title("DotProduct");
-			HBoxContainer *hbc = memnew( HBoxContainer );
-			hbc->add_constant_override("separation",0);
-			hbc->add_child( memnew(Label("a")));
-			hbc->add_spacer();
-			hbc->add_child( memnew(Label("dp")));
-			gn->add_child(hbc);
-			gn->add_child( memnew(Label("b")));
+		ob->select(graph->scalar_func_node_get_function(type,p_id));
+		ob->connect("item_selected",this,"_scalar_func_changed",varray(p_id));
+		gn->add_child(ob);
 
-			gn->set_slot(0,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
-			gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],false,0,Color());
+		HBoxContainer *hbc = memnew( HBoxContainer );
+		if (graph->is_slot_connected(type, p_id, 0)) {
+			hbc->add_child(make_label("in", Variant::REAL));
+		} else {
+			float v = graph->default_get_value(type,p_id,0);
+			hbc->add_child(make_editor(String("in: ")+Variant(v),gn,p_id,0,Variant::REAL,hint_spin));
+		}
+		hbc->add_spacer();
+		hbc->add_child( memnew(Label("out")));
+		gn->add_child(hbc);
 
-		} break; // vec3 . vec3 (dot product -> scalar output)
-		case ShaderGraph::NODE_VEC_TO_SCALAR: {
+		gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR],true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
 
-			gn->set_title("Vec2Scalar");
-			HBoxContainer *hbc = memnew( HBoxContainer );
-			hbc->add_constant_override("separation",0);
-			hbc->add_child( memnew(Label("vec")));
-			hbc->add_spacer();
-			Label *l=memnew(Label("x"));
-			l->set_align(Label::ALIGN_RIGHT);
-			hbc->add_child( l);
-			gn->add_child(hbc);
-			l=memnew(Label("y"));
-			l->set_align(Label::ALIGN_RIGHT);
-			gn->add_child( l );
-			l=memnew(Label("z"));
-			l->set_align(Label::ALIGN_RIGHT);
-			gn->add_child( l);
 
-			gn->set_slot(0,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
-			gn->set_slot(1,false,0,Color(),true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
-			gn->set_slot(2,false,0,Color(),true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
+	} break; // scalar function (sin: { } break; cos: { } break; etc)
+	case ShaderGraph::NODE_VEC_FUNC: {
 
 
 
+		gn->set_title("VecFunc");
+		static const char* func_name[ShaderGraph::VEC_MAX_FUNC]={
+			"Normalize",
+			"Saturate",
+			"Negate",
+			"Reciprocal",
+			"RGB to HSV",
+			"HSV to RGB",
+		};
 
-		} break; // 1 vec3 input: { } break; 3 scalar outputs
-		case ShaderGraph::NODE_SCALAR_TO_VEC: {
+		OptionButton *ob = memnew( OptionButton );
+		for(int i=0;i<ShaderGraph::VEC_MAX_FUNC;i++) {
 
-			gn->set_title("Scalar2Vec");
-			HBoxContainer *hbc = memnew( HBoxContainer );
-			hbc->add_child( memnew(Label("x")));
-			hbc->add_spacer();
-			hbc->add_child( memnew(Label("vec")));
-			gn->add_child(hbc);
-			gn->add_child( memnew(Label("y")));
-			gn->add_child( memnew(Label("z")));
+			ob->add_item(func_name[i],i);
+		}
 
-			gn->set_slot(0,true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
-			gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR],false,0,Color());
-			gn->set_slot(2,true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR],false,0,Color());
+		ob->select(graph->vec_func_node_get_function(type,p_id));
+		ob->connect("item_selected",this,"_vec_func_changed",varray(p_id));
+		gn->add_child(ob);
+
+		HBoxContainer *hbc = memnew( HBoxContainer );
+		hbc->add_constant_override("separation",0);
+		if (graph->is_slot_connected(type, p_id, 0)) {
+			hbc->add_child(make_label("in", Variant::VECTOR3));
+		} else {
+			Vector3 v = graph->default_get_value(type,p_id,0);
+			hbc->add_child(make_editor(String("in: ")+v,gn,p_id,0,Variant::VECTOR3));
+		}
+		hbc->add_spacer();
+		hbc->add_child( memnew(Label("out")));
+		gn->add_child(hbc);
+
+		gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
+
+	} break; // vector function (normalize: { } break; negate: { } break; reciprocal: { } break; rgb2hsv: { } break; hsv2rgb: { } break; etc: { } break; etc)
+	case ShaderGraph::NODE_VEC_LEN: {
+		gn->set_title("VecLength");
+		HBoxContainer *hbc = memnew( HBoxContainer );
+		if (graph->is_slot_connected(type, p_id, 0)) {
+			hbc->add_child(make_label("in", Variant::VECTOR3));
+		} else {
+			Vector3 v = graph->default_get_value(type,p_id,0);
+			hbc->add_child(make_editor(String("in: ")+v,gn,p_id,0,Variant::VECTOR3));
+		}
+		hbc->add_spacer();
+		hbc->add_child( memnew(Label("len")));
+		gn->add_child(hbc);
+
+		gn->set_slot(0,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
+
+	} break; // vec3 length
+	case ShaderGraph::NODE_DOT_PROD: {
+
+		gn->set_title("DotProduct");
+		HBoxContainer *hbc = memnew( HBoxContainer );
+		hbc->add_constant_override("separation",0);
+		if (graph->is_slot_connected(type, p_id, 0)) {
+			hbc->add_child(make_label("a", Variant::VECTOR3));
+		} else {
+			Vector3 v = graph->default_get_value(type,p_id,0);
+			hbc->add_child(make_editor(String("a: ")+v,gn,p_id,0,Variant::VECTOR3));
+		}
+		hbc->add_spacer();
+		hbc->add_child( memnew(Label("dp")));
+		gn->add_child(hbc);
+		if (graph->is_slot_connected(type, p_id, 1)) {
+			gn->add_child(make_label("b", Variant::VECTOR3));
+		} else {
+			Vector3 v = graph->default_get_value(type,p_id,1);
+			gn->add_child(make_editor(String("b: ")+v,gn,p_id,1,Variant::VECTOR3));
+		}
 
-		} break; // 3 scalar input: { } break; 1 vec3 output
-		case ShaderGraph::NODE_VEC_TO_XFORM: {
+		gn->set_slot(0,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
+		gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],false,0,Color());
 
-			gn->set_title("Vec2XForm");
-			HBoxContainer *hbc = memnew( HBoxContainer );
-			hbc->add_constant_override("separation",0);
-			hbc->add_child( memnew(Label("x")));
-			hbc->add_spacer();
-			hbc->add_child( memnew(Label("xf")));
-			gn->add_child(hbc);
-			gn->add_child( memnew(Label("y")));
-			gn->add_child( memnew(Label("z")));
-			gn->add_child( memnew(Label("ofs")));
+	} break; // vec3 . vec3 (dot product -> scalar output)
+	case ShaderGraph::NODE_VEC_TO_SCALAR: {
 
-			gn->set_slot(0,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],true,ShaderGraph::SLOT_TYPE_XFORM,typecol[ShaderGraph::SLOT_TYPE_XFORM]);
-			gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],false,0,Color());
-			gn->set_slot(2,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],false,0,Color());
-			gn->set_slot(3,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],false,0,Color());
+		gn->set_title("Vec2Scalar");
+		HBoxContainer *hbc = memnew( HBoxContainer );
+		hbc->add_constant_override("separation",0);
+		if (graph->is_slot_connected(type, p_id, 0)) {
+			hbc->add_child(make_label("vec", Variant::VECTOR3));
+		} else {
+			Vector3 v = graph->default_get_value(type,p_id,0);
+			hbc->add_child(make_editor(String("vec: ")+v,gn,p_id,0,Variant::VECTOR3));
+		}
+		hbc->add_spacer();
+		Label *l=memnew(Label("x"));
+		l->set_align(Label::ALIGN_RIGHT);
+		hbc->add_child( l);
+		gn->add_child(hbc);
+		l=memnew(Label("y"));
+		l->set_align(Label::ALIGN_RIGHT);
+		gn->add_child( l );
+		l=memnew(Label("z"));
+		l->set_align(Label::ALIGN_RIGHT);
+		gn->add_child( l);
+
+		gn->set_slot(0,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
+		gn->set_slot(1,false,0,Color(),true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
+		gn->set_slot(2,false,0,Color(),true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
+
+
+
+
+	} break; // 1 vec3 input: { } break; 3 scalar outputs
+	case ShaderGraph::NODE_SCALAR_TO_VEC: {
+
+		gn->set_title("Scalar2Vec");
+		HBoxContainer *hbc = memnew( HBoxContainer );
+		if (graph->is_slot_connected(type, p_id, 0)) {
+			hbc->add_child(make_label("x", Variant::REAL));
+		} else {
+			float v = graph->default_get_value(type,p_id,0);
+			hbc->add_child(make_editor(String("x: ")+Variant(v),gn,p_id,0,Variant::REAL));
+		}
+		hbc->add_spacer();
+		hbc->add_child( memnew(Label("vec")));
+		gn->add_child(hbc);
+		if (graph->is_slot_connected(type, p_id, 1)) {
+			gn->add_child(make_label("y", Variant::REAL));
+		} else {
+			float v = graph->default_get_value(type,p_id,1);
+			gn->add_child(make_editor(String("y: ")+Variant(v),gn,p_id,1,Variant::REAL));
+		}
+		if (graph->is_slot_connected(type, p_id, 2)) {
+			gn->add_child(make_label("in", Variant::REAL));
+		} else {
+			float v = graph->default_get_value(type,p_id,2);
+			gn->add_child(make_editor(String("in: ")+Variant(v),gn,p_id,2,Variant::REAL));
+		}
 
-		} break; // 3 vec input: { } break; 1 xform output
-		case ShaderGraph::NODE_XFORM_TO_VEC: {
+		gn->set_slot(0,true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
+		gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR],false,0,Color());
+		gn->set_slot(2,true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR],false,0,Color());
+
+	} break; // 3 scalar input: { } break; 1 vec3 output
+	case ShaderGraph::NODE_VEC_TO_XFORM: {
+
+		gn->set_title("Vec2XForm");
+		HBoxContainer *hbc = memnew( HBoxContainer );
+		hbc->add_constant_override("separation",0);
+		if (graph->is_slot_connected(type, p_id, 0)) {
+			hbc->add_child(make_label("x", Variant::VECTOR3));
+		} else {
+			Vector3 v = graph->default_get_value(type,p_id,0);
+			hbc->add_child(make_editor(String("x: ")+v,gn,p_id,0,Variant::VECTOR3));
+		}
+		hbc->add_spacer();
+		hbc->add_child( memnew(Label("xf")));
+		gn->add_child(hbc);
+		if (graph->is_slot_connected(type, p_id, 1)) {
+			gn->add_child(make_label("y", Variant::VECTOR3));
+		} else {
+			Vector3 v = graph->default_get_value(type,p_id,1);
+			gn->add_child(make_editor(String("y: ")+v,gn,p_id,1,Variant::VECTOR3));
+		}
+		if (graph->is_slot_connected(type, p_id, 2)) {
+			gn->add_child(make_label("z", Variant::VECTOR3));
+		} else {
+			Vector3 v = graph->default_get_value(type,p_id,2);
+			gn->add_child(make_editor(String("z: ")+v,gn,p_id,2,Variant::VECTOR3));
+		}
+		if (graph->is_slot_connected(type, p_id, 3)) {
+			gn->add_child(make_label("ofs", Variant::VECTOR3));
+		} else {
+			Vector3 v = graph->default_get_value(type,p_id,3);
+			gn->add_child(make_editor(String("ofs: ")+v,gn,p_id,3,Variant::VECTOR3));
+		}
 
-			gn->set_title("XForm2Vec");
+		gn->set_slot(0,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],true,ShaderGraph::SLOT_TYPE_XFORM,typecol[ShaderGraph::SLOT_TYPE_XFORM]);
+		gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],false,0,Color());
+		gn->set_slot(2,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],false,0,Color());
+		gn->set_slot(3,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],false,0,Color());
 
-			HBoxContainer *hbc = memnew( HBoxContainer );
-			hbc->add_constant_override("separation",0);
-			hbc->add_child( memnew(Label("xf")));
-			hbc->add_spacer();
-			Label *l=memnew(Label("x"));
-			l->set_align(Label::ALIGN_RIGHT);
-			hbc->add_child( l);
-			gn->add_child(hbc);
-			l=memnew(Label("y"));
-			l->set_align(Label::ALIGN_RIGHT);
-			gn->add_child( l );
-			l=memnew(Label("z"));
-			l->set_align(Label::ALIGN_RIGHT);
-			gn->add_child( l);
-			l=memnew(Label("ofs"));
-			l->set_align(Label::ALIGN_RIGHT);
-			gn->add_child( l);
-
-			gn->set_slot(0,true,ShaderGraph::SLOT_TYPE_XFORM,typecol[ShaderGraph::SLOT_TYPE_XFORM],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
-			gn->set_slot(1,false,0,Color(),true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
-			gn->set_slot(2,false,0,Color(),true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
-			gn->set_slot(3,false,0,Color(),true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
-
-		} break; // 3 vec input: { } break; 1 xform output
-		case ShaderGraph::NODE_SCALAR_INTERP: {
-
-			gn->set_title("ScalarInterp");
-			HBoxContainer *hbc = memnew( HBoxContainer );
-			hbc->add_constant_override("separation",0);
-			hbc->add_child( memnew(Label("a")));
-			hbc->add_spacer();
-			hbc->add_child( memnew(Label("interp")));
-			gn->add_child(hbc);
-			gn->add_child( memnew(Label("b")));
-			gn->add_child( memnew(Label("c")));
+	} break; // 3 vec input: { } break; 1 xform output
+	case ShaderGraph::NODE_XFORM_TO_VEC: {
 
-			gn->set_slot(0,true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR],true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
-			gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR],false,0,Color());
-			gn->set_slot(2,true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR],false,0,Color());
+		gn->set_title("XForm2Vec");
 
+		HBoxContainer *hbc = memnew( HBoxContainer );
+		hbc->add_constant_override("separation",0);
+		if (graph->is_slot_connected(type, p_id, 0)) {
+			hbc->add_child(make_label("fx", Variant::TRANSFORM));
+		} else {
+			hbc->add_child(make_editor(String("fx: edit..."),gn,p_id,0,Variant::TRANSFORM));
+		}
+		hbc->add_spacer();
+		Label *l=memnew(Label("x"));
+		l->set_align(Label::ALIGN_RIGHT);
+		hbc->add_child( l);
+		gn->add_child(hbc);
+		l=memnew(Label("y"));
+		l->set_align(Label::ALIGN_RIGHT);
+		gn->add_child( l );
+		l=memnew(Label("z"));
+		l->set_align(Label::ALIGN_RIGHT);
+		gn->add_child( l);
+		l=memnew(Label("ofs"));
+		l->set_align(Label::ALIGN_RIGHT);
+		gn->add_child( l);
+
+		gn->set_slot(0,true,ShaderGraph::SLOT_TYPE_XFORM,typecol[ShaderGraph::SLOT_TYPE_XFORM],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
+		gn->set_slot(1,false,0,Color(),true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
+		gn->set_slot(2,false,0,Color(),true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
+		gn->set_slot(3,false,0,Color(),true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
+
+	} break; // 3 vec input: { } break; 1 xform output
+	case ShaderGraph::NODE_SCALAR_INTERP: {
+
+		gn->set_title("ScalarInterp");
+		HBoxContainer *hbc = memnew( HBoxContainer );
+		hbc->add_constant_override("separation",0);
+		if (graph->is_slot_connected(type, p_id, 0)) {
+			hbc->add_child(make_label("a", Variant::REAL));
+		} else {
+			float v = graph->default_get_value(type,p_id,0);
+			hbc->add_child(make_editor(String("a: ")+Variant(v),gn,p_id,0,Variant::REAL,hint_spin));
+		}
+		hbc->add_spacer();
+		hbc->add_child( memnew(Label("interp")));
+		gn->add_child(hbc);
+		if (graph->is_slot_connected(type, p_id, 1)) {
+			gn->add_child(make_label("b", Variant::REAL));
+		} else {
+			float v = graph->default_get_value(type,p_id,1);
+			gn->add_child(make_editor(String("b: ")+Variant(v),gn,p_id,1,Variant::REAL,hint_spin));
+		}
+		if (graph->is_slot_connected(type, p_id, 2)) {
+			gn->add_child(make_label("c", Variant::REAL));
+		} else {
+			float v = graph->default_get_value(type,p_id,2);
+			gn->add_child(make_editor(String("c: ")+Variant(v),gn,p_id,2,Variant::REAL,hint_slider));
+		}
 
-		} break; // scalar interpolation (with optional curve)
-		case ShaderGraph::NODE_VEC_INTERP: {
+		gn->set_slot(0,true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR],true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
+		gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR],false,0,Color());
+		gn->set_slot(2,true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR],false,0,Color());
 
-			gn->set_title("VecInterp");
-			HBoxContainer *hbc = memnew( HBoxContainer );
-			hbc->add_child( memnew(Label("a")));
-			hbc->add_spacer();
-			hbc->add_child( memnew(Label("interp")));
-			gn->add_child(hbc);
-			gn->add_child( memnew(Label("b")));
-			gn->add_child( memnew(Label("c")));
 
-			gn->set_slot(0,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
-			gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],false,0,Color());
-			gn->set_slot(2,true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR],false,0,Color());
+	} break; // scalar interpolation (with optional curve)
+	case ShaderGraph::NODE_VEC_INTERP: {
 
-		} break; // vec3 interpolation  (with optional curve)
-		case ShaderGraph::NODE_COLOR_RAMP: {
+		gn->set_title("VecInterp");
+		HBoxContainer *hbc = memnew( HBoxContainer );
+		if (graph->is_slot_connected(type, p_id, 0)) {
+			hbc->add_child(make_label("a", Variant::VECTOR3));
+		} else {
+			Vector3 v = graph->default_get_value(type,p_id,0);
+			hbc->add_child(make_editor(String("a: ")+v,gn,p_id,0,Variant::VECTOR3));
+		}
+		hbc->add_spacer();
+		hbc->add_child( memnew(Label("interp")));
+		gn->add_child(hbc);
+		if (graph->is_slot_connected(type, p_id, 1)) {
+			gn->add_child(make_label("b", Variant::VECTOR3));
+		} else {
+			Vector3 v = graph->default_get_value(type,p_id,1);
+			gn->add_child(make_editor(String("b: ")+v,gn,p_id,1,Variant::VECTOR3));
+		}
+		if (graph->is_slot_connected(type, p_id, 2)) {
+			gn->add_child(make_label("c", Variant::REAL));
+		} else {
+			float v = graph->default_get_value(type,p_id,2);
+			gn->add_child(make_editor(String("c: ")+Variant(v),gn,p_id,2,Variant::REAL,hint_slider));
+		}
 
-			gn->set_title("ColorRamp");
-			GraphColorRampEdit * ramp  = memnew( GraphColorRampEdit );
+		gn->set_slot(0,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
+		gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],false,0,Color());
+		gn->set_slot(2,true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR],false,0,Color());
 
-			DVector<real_t> offsets = graph->color_ramp_node_get_offsets(type,p_id);
-			DVector<Color> colors = graph->color_ramp_node_get_colors(type,p_id);
+	} break; // vec3 interpolation  (with optional curve)
+	case ShaderGraph::NODE_COLOR_RAMP: {
 
-			int oc = offsets.size();
+		gn->set_title("ColorRamp");
+		GraphColorRampEdit * ramp  = memnew( GraphColorRampEdit );
 
-			if (oc) {
-				DVector<real_t>::Read rofs = offsets.read();
-				DVector<Color>::Read rcol = colors.read();
+		DVector<real_t> offsets = graph->color_ramp_node_get_offsets(type,p_id);
+		DVector<Color> colors = graph->color_ramp_node_get_colors(type,p_id);
 
-				Vector<float> ofsv;
-				Vector<Color> colorv;
-				for(int i=0;i<oc;i++) {
-					ofsv.push_back(rofs[i]);
-					colorv.push_back(rcol[i]);
-				}
+		int oc = offsets.size();
 
-				ramp->set_ramp(ofsv,colorv);
+		if (oc) {
+			DVector<real_t>::Read rofs = offsets.read();
+			DVector<Color>::Read rcol = colors.read();
 
+			Vector<float> ofsv;
+			Vector<Color> colorv;
+			for(int i=0;i<oc;i++) {
+				ofsv.push_back(rofs[i]);
+				colorv.push_back(rcol[i]);
 			}
 
-			ramp->connect("ramp_changed",this,"_color_ramp_changed",varray(p_id,ramp));
-			ramp->set_custom_minimum_size(Size2(128,1));
-			gn->add_child(ramp);
+			ramp->set_ramp(ofsv,colorv);
 
+		}
 
-			HBoxContainer *hbc = memnew( HBoxContainer );
-			hbc->add_constant_override("separation",0);
-			hbc->add_child( memnew(Label("c")));
-			hbc->add_spacer();
-			Label *l=memnew(Label("rgb"));
-			l->set_align(Label::ALIGN_RIGHT);
-			hbc->add_child( l);
-			gn->add_child(hbc);
-			l=memnew(Label("alpha"));
-			l->set_align(Label::ALIGN_RIGHT);
-			gn->add_child( l);
+		ramp->connect("ramp_changed",this,"_color_ramp_changed",varray(p_id,ramp));
+		ramp->set_custom_minimum_size(Size2(128,1));
+		gn->add_child(ramp);
 
 
-			gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
-			gn->set_slot(2,false,ShaderGraph::SLOT_MAX,Color(),true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
+		HBoxContainer *hbc = memnew( HBoxContainer );
+		hbc->add_constant_override("separation",0);
+		if (graph->is_slot_connected(type, p_id, 0)) {
+			hbc->add_child(make_label("c", Variant::REAL));
+		} else {
+			float v = graph->default_get_value(type,p_id,0);
+			hbc->add_child(make_editor(String("c: ")+Variant(v),gn,p_id,0,Variant::REAL,hint_slider));
+		}
+		hbc->add_spacer();
+		Label *l=memnew(Label("rgb"));
+		l->set_align(Label::ALIGN_RIGHT);
+		hbc->add_child( l);
+		gn->add_child(hbc);
+		l=memnew(Label("alpha"));
+		l->set_align(Label::ALIGN_RIGHT);
+		gn->add_child( l);
 
 
-		} break; // scalar interpolation (with optional curve)
-		case ShaderGraph::NODE_CURVE_MAP: {
+		gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
+		gn->set_slot(2,false,ShaderGraph::SLOT_MAX,Color(),true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
 
-			gn->set_title("CurveMap");
-			GraphCurveMapEdit * map  = memnew( GraphCurveMapEdit );
 
-			DVector<Vector2> points = graph->curve_map_node_get_points(type,p_id);
+	} break; // scalar interpolation (with optional curve)
+	case ShaderGraph::NODE_CURVE_MAP: {
 
-			int oc = points.size();
+		gn->set_title("CurveMap");
+		GraphCurveMapEdit * map  = memnew( GraphCurveMapEdit );
 
-			if (oc) {
-				DVector<Vector2>::Read rofs = points.read();
+		DVector<Vector2> points = graph->curve_map_node_get_points(type,p_id);
 
+		int oc = points.size();
 
-				Vector<Vector2> ofsv;
-				for(int i=0;i<oc;i++) {
-					ofsv.push_back(rofs[i]);
-				}
+		if (oc) {
+			DVector<Vector2>::Read rofs = points.read();
 
-				map->set_points(ofsv);
 
+			Vector<Vector2> ofsv;
+			for(int i=0;i<oc;i++) {
+				ofsv.push_back(rofs[i]);
 			}
-			map->connect("curve_changed",this,"_curve_changed",varray(p_id,map));
 
-			//map->connect("map_changed",this,"_curve_map_changed",varray(p_id,map));
-			map->set_custom_minimum_size(Size2(128,64));
-			gn->add_child(map);
+			map->set_points(ofsv);
 
+		}
+		map->connect("curve_changed",this,"_curve_changed",varray(p_id,map));
+
+		//map->connect("map_changed",this,"_curve_map_changed",varray(p_id,map));
+		map->set_custom_minimum_size(Size2(128,64));
+		gn->add_child(map);
+
+		HBoxContainer *hbc = memnew( HBoxContainer );
+		hbc->add_constant_override("separation",0);
+		if (graph->is_slot_connected(type, p_id, 0)) {
+			hbc->add_child(make_label("c", Variant::REAL));
+		} else {
+			float v = graph->default_get_value(type,p_id,0);
+			hbc->add_child(make_editor(String("c: ")+Variant(v),gn,p_id,0,Variant::REAL,hint_slider));
+		}
+		hbc->add_spacer();
+		Label *l=memnew(Label("cmap"));
+		l->set_align(Label::ALIGN_RIGHT);
+		hbc->add_child( l);
+		gn->add_child(hbc);
+
+
+		gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR],true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
+
+
+	} break; // scalar interpolation (with optional curve)
+
+	case ShaderGraph::NODE_SCALAR_INPUT: {
+
+		gn->set_title("ScalarUniform");
+		LineEdit *le = memnew( LineEdit );
+		gn->add_child(le);
+		le->set_text(graph->input_node_get_name(type,p_id));
+		le->connect("text_entered",this,"_input_name_changed",varray(p_id,le));
+		SpinBox *sb = memnew( SpinBox );
+		sb->set_min(-100000);
+		sb->set_max(100000);
+		sb->set_step(0.001);
+		sb->set_val(graph->scalar_input_node_get_value(type,p_id));
+		sb->connect("value_changed",this,"_scalar_input_changed",varray(p_id));
+		gn->add_child(sb);
+		gn->set_slot(1,false,0,Color(),true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
+
+	} break; // scalar uniform (assignable in material)
+	case ShaderGraph::NODE_VEC_INPUT: {
+
+		gn->set_title("VectorUniform");
+		LineEdit *le = memnew( LineEdit );
+		gn->add_child(le);
+		le->set_text(graph->input_node_get_name(type,p_id));
+		le->connect("text_entered",this,"_input_name_changed",varray(p_id,le));
+		Array v3p(true);
+		for(int i=0;i<3;i++) {
 			HBoxContainer *hbc = memnew( HBoxContainer );
-			hbc->add_constant_override("separation",0);
-			hbc->add_child( memnew(Label("c")));
-			hbc->add_spacer();
-			Label *l=memnew(Label("cmap"));
-			l->set_align(Label::ALIGN_RIGHT);
-			hbc->add_child( l);
-			gn->add_child(hbc);
-
-
-			gn->set_slot(1,true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR],true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
-
-
-		} break; // scalar interpolation (with optional curve)
-
-		case ShaderGraph::NODE_SCALAR_INPUT: {
-
-			gn->set_title("ScalarUniform");
-			LineEdit *le = memnew( LineEdit );
-			gn->add_child(le);
-			le->set_text(graph->input_node_get_name(type,p_id));
-			le->connect("text_entered",this,"_input_name_changed",varray(p_id,le));
+			Label *l = memnew( Label );
+			l->set_text(String::chr('X'+i));
+			hbc->add_child(l);
 			SpinBox *sb = memnew( SpinBox );
+			sb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
 			sb->set_min(-100000);
 			sb->set_max(100000);
 			sb->set_step(0.001);
-			sb->set_val(graph->scalar_input_node_get_value(type,p_id));
-			sb->connect("value_changed",this,"_scalar_input_changed",varray(p_id));
-			gn->add_child(sb);
-			gn->set_slot(1,false,0,Color(),true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
-
-		} break; // scalar uniform (assignable in material)
-		case ShaderGraph::NODE_VEC_INPUT: {
-
-			gn->set_title("VectorUniform");
-			LineEdit *le = memnew( LineEdit );
-			gn->add_child(le);
-			le->set_text(graph->input_node_get_name(type,p_id));
-			le->connect("text_entered",this,"_input_name_changed",varray(p_id,le));
-			Array v3p(true);
-			for(int i=0;i<3;i++) {
-				HBoxContainer *hbc = memnew( HBoxContainer );
-				Label *l = memnew( Label );
-				l->set_text(String::chr('X'+i));
-				hbc->add_child(l);
-				SpinBox *sb = memnew( SpinBox );
-				sb->set_h_size_flags(Control::SIZE_EXPAND_FILL);
-				sb->set_min(-100000);
-				sb->set_max(100000);
-				sb->set_step(0.001);
-				sb->set_val(graph->vec_input_node_get_value(type,p_id)[i]);
-				sb->connect("value_changed",this,"_vec_input_changed",varray(p_id,v3p));
-				v3p.push_back(sb);
-				hbc->add_child(sb);
-				gn->add_child(hbc);
-			}
-			gn->set_slot(1,false,0,Color(),true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
-
-		} break; // vec3 uniform (assignable in material)
-		case ShaderGraph::NODE_RGB_INPUT: {
-
-			gn->set_title("ColorUniform");
-			LineEdit *le = memnew( LineEdit );
-			gn->add_child(le);
-			le->set_text(graph->input_node_get_name(type,p_id));
-			le->connect("text_entered",this,"_input_name_changed",varray(p_id,le));
-			ColorPickerButton *cpb = memnew( ColorPickerButton );
-			cpb->set_color(graph->rgb_input_node_get_value(type,p_id));
-			cpb->connect("color_changed",this,"_rgb_input_changed",varray(p_id));
-			gn->add_child(cpb);
-			Label *l = memnew( Label );
-			l->set_text("RGB");
-			l->set_align(Label::ALIGN_RIGHT);
-			gn->add_child(l);
-			l = memnew( Label );
-			l->set_text("Alpha");
-			l->set_align(Label::ALIGN_RIGHT);
-			gn->add_child(l);
-
-			gn->set_slot(2,false,0,Color(),true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
-			gn->set_slot(3,false,0,Color(),true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
-
-
-		} break; // color uniform (assignable in material)
-		case ShaderGraph::NODE_XFORM_INPUT: {
-			gn->set_title("XFUniform");
-			LineEdit *le = memnew( LineEdit );
-			gn->add_child(le);
-			le->set_text(graph->input_node_get_name(type,p_id));
-			le->connect("text_entered",this,"_input_name_changed",varray(p_id,le));
-			ToolButton *edit = memnew( ToolButton );
-			edit->set_text("edit..");
-			edit->connect("pressed",this,"_xform_input_changed",varray(p_id,edit));
-			gn->add_child(edit);
-			gn->set_slot(1,false,0,Color(),true,ShaderGraph::SLOT_TYPE_XFORM,typecol[ShaderGraph::SLOT_TYPE_XFORM]);
-
-		} break; // mat4 uniform (assignable in material)
-		case ShaderGraph::NODE_TEXTURE_INPUT: {
-
-			gn->set_title("TexUniform");
-			LineEdit *le = memnew( LineEdit );
-			gn->add_child(le);
-			le->set_text(graph->input_node_get_name(type,p_id));
-			le->connect("text_entered",this,"_input_name_changed",varray(p_id,le));
-			TextureFrame *tex = memnew( TextureFrame );
-			tex->set_expand(true);
-			tex->set_custom_minimum_size(Size2(80,80));
-			gn->add_child(tex);
-			tex->set_texture(graph->texture_input_node_get_value(type,p_id));
-			ToolButton *edit = memnew( ToolButton );
-			edit->set_text("edit..");
-			edit->connect("pressed",this,"_tex_edited",varray(p_id,edit));
-			gn->add_child(edit);
-
-			HBoxContainer *hbc = memnew( HBoxContainer );
-			hbc->add_constant_override("separation",0);
-			hbc->add_child( memnew(Label("UV")));
-			hbc->add_spacer();
-			Label *l=memnew(Label("RGB"));
-			l->set_align(Label::ALIGN_RIGHT);
-			hbc->add_child(l);
-			gn->add_child(hbc);
-			l = memnew( Label );
-			l->set_text("Alpha");
-			l->set_align(Label::ALIGN_RIGHT);
-			gn->add_child(l);
-
-			gn->set_slot(3,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
-			gn->set_slot(4,false,0,Color(),true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
-
-		} break; // texture input (assignable in material)
-		case ShaderGraph::NODE_CUBEMAP_INPUT: {
-
-			gn->set_title("TexUniform");
-			LineEdit *le = memnew( LineEdit );
-			gn->add_child(le);
-			le->set_text(graph->input_node_get_name(type,p_id));
-			le->connect("text_entered",this,"_input_name_changed",varray(p_id,le));
-
-			ToolButton *edit = memnew( ToolButton );
-			edit->set_text("edit..");
-			edit->connect("pressed",this,"_cube_edited",varray(p_id,edit));
-			gn->add_child(edit);
-
-
-			HBoxContainer *hbc = memnew( HBoxContainer );
-			hbc->add_constant_override("separation",0);
-			hbc->add_child( memnew(Label("UV")));
-			hbc->add_spacer();
-			Label *l=memnew(Label("RGB"));
-			l->set_align(Label::ALIGN_RIGHT);
-			hbc->add_child(l);
+			sb->set_val(graph->vec_input_node_get_value(type,p_id)[i]);
+			sb->connect("value_changed",this,"_vec_input_changed",varray(p_id,v3p));
+			v3p.push_back(sb);
+			hbc->add_child(sb);
 			gn->add_child(hbc);
-			l = memnew( Label );
-			l->set_text("Alpha");
-			l->set_align(Label::ALIGN_RIGHT);
-			gn->add_child(l);
-
-			gn->set_slot(2,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
-			gn->set_slot(3,false,0,Color(),true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
-
-		} break; // cubemap input (assignable in material)
-		case ShaderGraph::NODE_DEFAULT_TEXTURE: {
-
-			gn->set_title("CanvasItemTex");
-			HBoxContainer *hbc = memnew( HBoxContainer );
-			hbc->add_constant_override("separation",0);
-			hbc->add_child( memnew(Label("UV")));
-			hbc->add_spacer();
-			Label *l=memnew(Label("RGB"));
-			l->set_align(Label::ALIGN_RIGHT);
-			hbc->add_child(l);
-			gn->add_child(hbc);
-			l = memnew( Label );
-			l->set_text("Alpha");
-			l->set_align(Label::ALIGN_RIGHT);
-			gn->add_child(l);
-
-			gn->set_slot(0,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
-			gn->set_slot(1,false,0,Color(),true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
-
-
-		} break; // screen texture sampler (takes UV) (only usable in fragment case Shader)
-
-		case ShaderGraph::NODE_OUTPUT: {
-			gn->set_title("Output");
-
-			List<ShaderGraph::SlotInfo> si;
-			ShaderGraph::get_input_output_node_slot_info(graph->get_mode(),type,&si);
-
-			int idx=0;
-			for (List<ShaderGraph::SlotInfo>::Element *E=si.front();E;E=E->next()) {
-				ShaderGraph::SlotInfo& s=E->get();
-				if (s.dir==ShaderGraph::SLOT_OUT) {
-
-					Label *l= memnew( Label );
-					l->set_text(s.name);
-					l->set_align(Label::ALIGN_LEFT);
-					gn->add_child(l);
-					gn->set_slot(idx,true,s.type,typecol[s.type],false,0,Color());
-					idx++;
-				}
+		}
+		gn->set_slot(1,false,0,Color(),true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
+
+	} break; // vec3 uniform (assignable in material)
+	case ShaderGraph::NODE_RGB_INPUT: {
+
+		gn->set_title("ColorUniform");
+		LineEdit *le = memnew( LineEdit );
+		gn->add_child(le);
+		le->set_text(graph->input_node_get_name(type,p_id));
+		le->connect("text_entered",this,"_input_name_changed",varray(p_id,le));
+		ColorPickerButton *cpb = memnew( ColorPickerButton );
+		cpb->set_color(graph->rgb_input_node_get_value(type,p_id));
+		cpb->connect("color_changed",this,"_rgb_input_changed",varray(p_id));
+		gn->add_child(cpb);
+		Label *l = memnew( Label );
+		l->set_text("RGB");
+		l->set_align(Label::ALIGN_RIGHT);
+		gn->add_child(l);
+		l = memnew( Label );
+		l->set_text("Alpha");
+		l->set_align(Label::ALIGN_RIGHT);
+		gn->add_child(l);
+
+		gn->set_slot(2,false,0,Color(),true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
+		gn->set_slot(3,false,0,Color(),true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
+
+
+	} break; // color uniform (assignable in material)
+	case ShaderGraph::NODE_XFORM_INPUT: {
+		gn->set_title("XFUniform");
+		LineEdit *le = memnew( LineEdit );
+		gn->add_child(le);
+		le->set_text(graph->input_node_get_name(type,p_id));
+		le->connect("text_entered",this,"_input_name_changed",varray(p_id,le));
+		ToolButton *edit = memnew( ToolButton );
+		edit->set_text("edit..");
+		edit->connect("pressed",this,"_xform_input_changed",varray(p_id,edit));
+		gn->add_child(edit);
+		gn->set_slot(1,false,0,Color(),true,ShaderGraph::SLOT_TYPE_XFORM,typecol[ShaderGraph::SLOT_TYPE_XFORM]);
+
+	} break; // mat4 uniform (assignable in material)
+	case ShaderGraph::NODE_TEXTURE_INPUT: {
+
+		gn->set_title("TexUniform");
+		LineEdit *le = memnew( LineEdit );
+		gn->add_child(le);
+		le->set_text(graph->input_node_get_name(type,p_id));
+		le->connect("text_entered",this,"_input_name_changed",varray(p_id,le));
+		TextureFrame *tex = memnew( TextureFrame );
+		tex->set_expand(true);
+		tex->set_custom_minimum_size(Size2(80,80));
+		gn->add_child(tex);
+		tex->set_texture(graph->texture_input_node_get_value(type,p_id));
+		ToolButton *edit = memnew( ToolButton );
+		edit->set_text("edit..");
+		edit->connect("pressed",this,"_tex_edited",varray(p_id,edit));
+		gn->add_child(edit);
+
+		HBoxContainer *hbc = memnew( HBoxContainer );
+		hbc->add_constant_override("separation",0);
+		if (graph->is_slot_connected(type, p_id, 0)) {
+			hbc->add_child(make_label("UV", Variant::VECTOR3));
+		} else {
+			Vector3 v = graph->default_get_value(type,p_id,0);
+			hbc->add_child(make_editor(String("UV: ")+v,gn,p_id,0,Variant::VECTOR3));
+		}
+		hbc->add_spacer();
+		Label *l=memnew(Label("RGB"));
+		l->set_align(Label::ALIGN_RIGHT);
+		hbc->add_child(l);
+		gn->add_child(hbc);
+		l = memnew( Label );
+		l->set_text("Alpha");
+		l->set_align(Label::ALIGN_RIGHT);
+		gn->add_child(l);
+
+		gn->set_slot(3,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
+		gn->set_slot(4,false,0,Color(),true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
+
+	} break; // texture input (assignable in material)
+	case ShaderGraph::NODE_CUBEMAP_INPUT: {
+
+		gn->set_title("TexUniform");
+		LineEdit *le = memnew( LineEdit );
+		gn->add_child(le);
+		le->set_text(graph->input_node_get_name(type,p_id));
+		le->connect("text_entered",this,"_input_name_changed",varray(p_id,le));
+
+		ToolButton *edit = memnew( ToolButton );
+		edit->set_text("edit..");
+		edit->connect("pressed",this,"_cube_edited",varray(p_id,edit));
+		gn->add_child(edit);
+
+
+		HBoxContainer *hbc = memnew( HBoxContainer );
+		hbc->add_constant_override("separation",0);
+		if (graph->is_slot_connected(type, p_id, 0)) {
+			hbc->add_child(make_label("UV", Variant::VECTOR3));
+		} else {
+			Vector3 v = graph->default_get_value(type,p_id,0);
+			hbc->add_child(make_editor(String("UV: ")+v,gn,p_id,0,Variant::VECTOR3));
+		}
+		hbc->add_spacer();
+		Label *l=memnew(Label("RGB"));
+		l->set_align(Label::ALIGN_RIGHT);
+		hbc->add_child(l);
+		gn->add_child(hbc);
+		l = memnew( Label );
+		l->set_text("Alpha");
+		l->set_align(Label::ALIGN_RIGHT);
+		gn->add_child(l);
+
+		gn->set_slot(2,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
+		gn->set_slot(3,false,0,Color(),true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
+
+	} break; // cubemap input (assignable in material)
+	case ShaderGraph::NODE_DEFAULT_TEXTURE: {
+
+		gn->set_title("CanvasItemTex");
+		HBoxContainer *hbc = memnew( HBoxContainer );
+		hbc->add_constant_override("separation",0);
+		if (graph->is_slot_connected(type, p_id, 0)) {
+			hbc->add_child(make_label("UV", Variant::VECTOR3));
+		} else {
+			Vector3 v = graph->default_get_value(type,p_id,0);
+			hbc->add_child(make_editor(String("UV: ")+v,gn,p_id,0,Variant::VECTOR3));
+		}
+		hbc->add_spacer();
+		Label *l=memnew(Label("RGB"));
+		l->set_align(Label::ALIGN_RIGHT);
+		hbc->add_child(l);
+		gn->add_child(hbc);
+		l = memnew( Label );
+		l->set_text("Alpha");
+		l->set_align(Label::ALIGN_RIGHT);
+		gn->add_child(l);
+
+		gn->set_slot(0,true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC],true,ShaderGraph::SLOT_TYPE_VEC,typecol[ShaderGraph::SLOT_TYPE_VEC]);
+		gn->set_slot(1,false,0,Color(),true,ShaderGraph::SLOT_TYPE_SCALAR,typecol[ShaderGraph::SLOT_TYPE_SCALAR]);
+
+
+	} break; // screen texture sampler (takes UV) (only usable in fragment case Shader)
+
+	case ShaderGraph::NODE_OUTPUT: {
+		gn->set_title("Output");
+		gn->set_show_close_button(false);
+
+		List<ShaderGraph::SlotInfo> si;
+		ShaderGraph::get_input_output_node_slot_info(graph->get_mode(),type,&si);
+
+		Array colors;
+		colors.push_back("Color");
+		colors.push_back("LightColor");
+		colors.push_back("Light");
+		colors.push_back("Diffuse");
+		colors.push_back("Specular");
+		colors.push_back("Emmision");
+		Array reals;
+		reals.push_back("Alpha");
+		reals.push_back("DiffuseAlpha");
+		reals.push_back("NormalMapDepth");
+		reals.push_back("SpecExp");
+		reals.push_back("Glow");
+		reals.push_back("ShadeParam");
+		reals.push_back("SpecularExp");
+		reals.push_back("LightAlpha");
+		reals.push_back("PointSize");
+		reals.push_back("Discard");
+
+		int idx=0;
+		for (List<ShaderGraph::SlotInfo>::Element *E=si.front();E;E=E->next()) {
+			ShaderGraph::SlotInfo& s=E->get();
+			if (s.dir==ShaderGraph::SLOT_OUT) {
+				Variant::Type v;
+				if (colors.find(s.name)>=0)
+					v=Variant::COLOR;
+				else if (reals.find(s.name)>=0)
+					v=Variant::REAL;
+				else
+					v=Variant::VECTOR3;
+				gn->add_child(make_label(s.name, v));
+				gn->set_slot(idx,true,s.type,typecol[s.type],false,0,Color());
+				idx++;
 			}
+		}
 
-		} break; // output (case Shader type dependent)
-		case ShaderGraph::NODE_COMMENT: {
-			gn->set_title("Comment");
-			TextEdit *te = memnew(TextEdit);
-			te->set_custom_minimum_size(Size2(100,100));
-			gn->add_child(te);
-			te->set_text(graph->comment_node_get_text(type,p_id));
-			te->connect("text_changed",this,"_comment_edited",varray(p_id,te));
+	} break; // output (case Shader type dependent)
+	case ShaderGraph::NODE_COMMENT: {
+		gn->set_title("Comment");
+		TextEdit *te = memnew(TextEdit);
+		te->set_custom_minimum_size(Size2(100,100));
+		gn->add_child(te);
+		te->set_text(graph->comment_node_get_text(type,p_id));
+		te->connect("text_changed",this,"_comment_edited",varray(p_id,te));
 
-		} break; // comment
+	} break; // comment
 
 
 
@@ -2076,8 +2504,6 @@ void ShaderGraphView::_update_graph() {
 		graph_edit->connect_node(node_map[E->get().src_id]->get_name(),E->get().src_slot,node_map[E->get().dst_id]->get_name(),E->get().dst_slot);
 	}
 
-
-
 }
 
 void ShaderGraphView::_sg_updated() {
@@ -2085,9 +2511,9 @@ void ShaderGraphView::_sg_updated() {
 	if (!graph.is_valid())
 		return;
 	switch(graph->get_graph_error(type)) {
-		case ShaderGraph::GRAPH_OK: status->set_text(""); break;
-		case ShaderGraph::GRAPH_ERROR_CYCLIC: status->set_text("Error: Cyclic Connection Link"); break;
-		case ShaderGraph::GRAPH_ERROR_MISSING_CONNECTIONS: status->set_text("Error: Missing Input Connections"); break;
+	case ShaderGraph::GRAPH_OK: status->set_text(""); break;
+	case ShaderGraph::GRAPH_ERROR_CYCLIC: status->set_text("Error: Cyclic Connection Link"); break;
+	case ShaderGraph::GRAPH_ERROR_MISSING_CONNECTIONS: status->set_text("Error: Missing Input Connections"); break;
 	}
 }
 
@@ -2112,9 +2538,12 @@ void ShaderGraphView::_notification(int p_what) {
 
 		ped_popup->connect("variant_changed",this,"_variant_edited");
 	}
- }
+}
+
+void ShaderGraphView::add_node(int p_type, const Vector2 &location) {
 
-void ShaderGraphView::add_node(int p_type) {
+	if ((p_type==ShaderGraph::NODE_INPUT||p_type==ShaderGraph::NODE_INPUT) && graph->node_count(type, p_type)>0)
+		return;
 
 	List<int> existing;
 	graph->get_node_list(type,&existing);
@@ -2127,7 +2556,7 @@ void ShaderGraphView::add_node(int p_type) {
 		}
 	}
 
-	Vector2 init_ofs(20,20);
+	Vector2 init_ofs = location;
 	while(true) {
 		bool valid=true;
 		for(List<int>::Element *E=existing.front();E;E=E->next()) {
@@ -2157,12 +2586,18 @@ void ShaderGraphView::add_node(int p_type) {
 void ShaderGraphView::_bind_methods() {
 
 	ObjectTypeDB::bind_method("_update_graph",&ShaderGraphView::_update_graph);
+	ObjectTypeDB::bind_method("_begin_node_move", &ShaderGraphView::_begin_node_move);
 	ObjectTypeDB::bind_method("_node_moved",&ShaderGraphView::_node_moved);
+	ObjectTypeDB::bind_method("_end_node_move", &ShaderGraphView::_end_node_move);
 	ObjectTypeDB::bind_method("_move_node",&ShaderGraphView::_move_node);
 	ObjectTypeDB::bind_method("_node_removed",&ShaderGraphView::_node_removed);
 	ObjectTypeDB::bind_method("_connection_request",&ShaderGraphView::_connection_request);
 	ObjectTypeDB::bind_method("_disconnection_request",&ShaderGraphView::_disconnection_request);
+	ObjectTypeDB::bind_method("_duplicate_nodes_request", &ShaderGraphView::_duplicate_nodes_request);
+	ObjectTypeDB::bind_method("_duplicate_nodes", &ShaderGraphView::_duplicate_nodes);
+	ObjectTypeDB::bind_method("_delete_nodes_request", &ShaderGraphView::_delete_nodes_request);
 
+	ObjectTypeDB::bind_method("_default_changed",&ShaderGraphView::_default_changed);
 	ObjectTypeDB::bind_method("_scalar_const_changed",&ShaderGraphView::_scalar_const_changed);
 	ObjectTypeDB::bind_method("_vec_const_changed",&ShaderGraphView::_vec_const_changed);
 	ObjectTypeDB::bind_method("_rgb_const_changed",&ShaderGraphView::_rgb_const_changed);
@@ -2200,6 +2635,8 @@ ShaderGraphView::ShaderGraphView(ShaderGraph::ShaderType p_type) {
 	graph_edit->add_child(ped_popup);
 	status = memnew( Label );
 	graph_edit->get_top_layer()->add_child(status);
+	graph_edit->connect("_begin_node_move", this, "_begin_node_move");
+	graph_edit->connect("_end_node_move", this, "_end_node_move");
 	status->set_pos(Vector2(5,5));
 	status->add_color_override("font_color_shadow",Color(0,0,0));
 	status->add_color_override("font_color",Color(1,0.4,0.3));
@@ -2222,9 +2659,18 @@ void ShaderGraphEditor::_add_node(int p_type) {
 
 	ShaderGraph::ShaderType shader_type=ShaderGraph::ShaderType(tabs->get_current_tab());
 
-	graph_edits[shader_type]->add_node(p_type);
+	graph_edits[shader_type]->add_node(p_type, next_location);
 }
 
+void ShaderGraphEditor::_popup_requested(const Vector2 &p_position)
+{
+	next_location = get_local_mouse_pos();
+	popup->set_global_pos(p_position);
+	popup->set_size( Size2( 200, 0) );
+	popup->popup();
+	popup->call_deferred("grab_click_focus");
+	popup->set_invalidate_click_until_motion();
+}
 
 void ShaderGraphEditor::_notification(int p_what) {
 	if (p_what==NOTIFICATION_ENTER_TREE) {
@@ -2243,11 +2689,11 @@ void ShaderGraphEditor::_notification(int p_what) {
 			if (nn.ends_with(":")) {
 				addsep=true;
 			}
-			menu->get_popup()->add_icon_item(get_icon(ic,"EditorIcons"),v,i);
+			popup->add_icon_item(get_icon(ic,"EditorIcons"),v,i);
 			if (addsep)
-				menu->get_popup()->add_separator();
+				popup->add_separator();
 		}
-		menu->get_popup()->connect("item_pressed",this,"_add_node");
+		popup->connect("item_pressed",this,"_add_node");
 
 
 	}
@@ -2256,7 +2702,7 @@ void ShaderGraphEditor::_notification(int p_what) {
 void ShaderGraphEditor::_bind_methods() {
 
 	ObjectTypeDB::bind_method("_add_node",&ShaderGraphEditor::_add_node);
-
+	ObjectTypeDB::bind_method("_popup_requested",&ShaderGraphEditor::_popup_requested);
 }
 
 
@@ -2285,16 +2731,16 @@ const char* ShaderGraphEditor::node_names[ShaderGraph::NODE_TYPE_MAX]={
 	"GraphVecsToXform:Vectors -> XForm:", // 3 vec input", 1 xform output
 	"GraphScalarInterp:Scalar Interpolate", // scalar interpolation (with optional curve)
 	"GraphVecInterp:Vector Interpolate:", // vec3 interpolation  (with optional curve)
-    "GraphColorRamp:Color Ramp", // vec3 interpolation  (with optional curve)
-    "GraphCurveMap:Curve Remap:", // vec3 interpolation  (with optional curve)
-    "GraphScalarUniform:Scalar Uniform", // scalar uniform (assignable in material)
+	"GraphColorRamp:Color Ramp", // vec3 interpolation  (with optional curve)
+	"GraphCurveMap:Curve Remap:", // vec3 interpolation  (with optional curve)
+	"GraphScalarUniform:Scalar Uniform", // scalar uniform (assignable in material)
 	"GraphVectorUniform:Vector Uniform", // vec3 uniform (assignable in material)
 	"GraphRgbUniform:RGB Uniform", // color uniform (assignable in material)
 	"GraphXformUniform:XForm Uniform", // mat4 uniform (assignable in material)
 	"GraphTextureUniform:Texture Uniform", // texture input (assignable in material)
 	"GraphCubeUniform:CubeMap Uniform:", // cubemap input (assignable in material)
-    "GraphDefaultTexture:CanvasItem Texture:", // cubemap input (assignable in material)
-    "Output", // output (shader type dependent)
+	"GraphDefaultTexture:CanvasItem Texture:", // cubemap input (assignable in material)
+	"Output", // output (shader type dependent)
 	"GraphComment:Comment", // comment
 
 
@@ -2302,11 +2748,8 @@ const char* ShaderGraphEditor::node_names[ShaderGraph::NODE_TYPE_MAX]={
 ShaderGraphEditor::ShaderGraphEditor(bool p_2d) {
 	_2d=p_2d;
 
-	HBoxContainer *hbc = memnew( HBoxContainer );
-	menu = memnew( MenuButton );
-	menu->set_text("Add Node..");
-	hbc->add_child(menu);
-	add_child(hbc);
+	popup = memnew( PopupMenu );
+	add_child(popup);
 
 
 	tabs = memnew(TabContainer);
@@ -2325,8 +2768,10 @@ ShaderGraphEditor::ShaderGraphEditor(bool p_2d) {
 		tabs->add_child(graph_edits[i]->get_graph_edit());
 		graph_edits[i]->get_graph_edit()->connect("connection_request",graph_edits[i],"_connection_request");
 		graph_edits[i]->get_graph_edit()->connect("disconnection_request",graph_edits[i],"_disconnection_request");
+		graph_edits[i]->get_graph_edit()->connect("duplicate_nodes_request", graph_edits[i], "_duplicate_nodes_request");
+		graph_edits[i]->get_graph_edit()->connect("popup_request",this,"_popup_requested");
+		graph_edits[i]->get_graph_edit()->connect("delete_nodes_request",graph_edits[i],"_delete_nodes_request");
 		graph_edits[i]->get_graph_edit()->set_right_disconnects(true);
-
 	}
 
 	tabs->set_current_tab(1);
@@ -2374,9 +2819,9 @@ ShaderGraphEditorPlugin::ShaderGraphEditorPlugin(EditorNode *p_node, bool p_2d)
 		SpatialEditor::get_singleton()->get_shader_split()->add_child(shader_editor);
 
 
-//	editor->get_viewport()->add_child(shader_editor);
-//	shader_editor->set_area_as_parent_rect();
-//	shader_editor->hide();
+	//	editor->get_viewport()->add_child(shader_editor);
+	//	shader_editor->set_area_as_parent_rect();
+	//	shader_editor->hide();
 
 }
 
diff --git a/tools/editor/plugins/shader_graph_editor_plugin.h b/tools/editor/plugins/shader_graph_editor_plugin.h
index 0051fbfd74..39e9b29d45 100644
--- a/tools/editor/plugins/shader_graph_editor_plugin.h
+++ b/tools/editor/plugins/shader_graph_editor_plugin.h
@@ -129,6 +129,7 @@ class ShaderGraphView : public Node {
 	GraphEdit *graph_edit;
 	Ref<ShaderGraph> graph;
 	int edited_id;
+	int edited_def;
 
 	ShaderGraph::ShaderType type;
 
@@ -136,13 +137,23 @@ class ShaderGraphView : public Node {
 	void _create_node(int p_id);
 
 
+	ToolButton *make_label(String text, Variant::Type v_type = Variant::NIL);
+	ToolButton *make_editor(String text, GraphNode* gn, int p_id, int param, Variant::Type type, String p_hint="");
 
 	void _connection_request(const String& p_from, int p_from_slot,const String& p_to,int p_to_slot);
 	void _disconnection_request(const String& p_from, int p_from_slot,const String& p_to,int p_to_slot);
 
 	void _node_removed(int p_id);
+	void _begin_node_move();
 	void _node_moved(const Vector2& p_from, const Vector2& p_to,int p_id);
+	void _end_node_move();
 	void _move_node(int p_id,const Vector2& p_to);
+	void _duplicate_nodes_request();
+    void _duplicate_nodes(const Array &p_nodes);
+	void _delete_nodes_request();
+
+
+	void _default_changed(int p_id, Node* p_button, int p_param, int v_type, String p_hint);
 
 	void _scalar_const_changed(double p_value,int p_id);
 	void _vec_const_changed(double p_value, int p_id, Array p_arr);
@@ -175,7 +186,7 @@ protected:
 	static void _bind_methods();
 public:
 
-	void add_node(int p_type);
+	void add_node(int p_type, const Vector2 &location);
 	GraphEdit *get_graph_edit() { return graph_edit; }
 	void set_graph(Ref<ShaderGraph> p_graph);
 
@@ -186,13 +197,15 @@ class ShaderGraphEditor : public VBoxContainer {
 
 	OBJ_TYPE(ShaderGraphEditor,VBoxContainer);
 
-	MenuButton *menu;
+	PopupMenu *popup;
 	TabContainer *tabs;
 	ShaderGraphView *graph_edits[ShaderGraph::SHADER_TYPE_MAX];
 	static const char* node_names[ShaderGraph::NODE_TYPE_MAX];
+	Vector2 next_location;
 
 	bool _2d;
 	void _add_node(int p_type);
+	void _popup_requested(const Vector2 &p_position);
 protected:
 	void _notification(int p_what);
 	static void _bind_methods();
diff --git a/tools/editor/plugins/spatial_editor_plugin.cpp b/tools/editor/plugins/spatial_editor_plugin.cpp
index 77663f39c0..3ab9339265 100644
--- a/tools/editor/plugins/spatial_editor_plugin.cpp
+++ b/tools/editor/plugins/spatial_editor_plugin.cpp
@@ -677,7 +677,8 @@ bool SpatialEditorViewport::_gizmo_select(const Vector2& p_screenpos,bool p_hili
 
 void SpatialEditorViewport::_smouseenter() {
 
-	surface->grab_focus();
+    if (!surface->has_focus() && (!get_focus_owner() || !get_focus_owner()->is_text_field()))
+            surface->grab_focus();
 }
 
 void SpatialEditorViewport::_sinput(const InputEvent &p_event) {
@@ -2168,7 +2169,18 @@ void SpatialEditorViewport::set_state(const Dictionary& p_state) {
 		view_menu->get_popup()->set_item_checked( idx, listener );
 	}
 
-
+	if (p_state.has("previewing")) {
+		Node *pv = EditorNode::get_singleton()->get_edited_scene()->get_node(p_state["previewing"]);
+		if (pv && pv->cast_to<Camera>()) {
+			previewing=pv->cast_to<Camera>();
+			previewing->connect("exit_tree",this,"_preview_exited_scene");
+			VS::get_singleton()->viewport_attach_camera( viewport->get_viewport(), previewing->get_camera() ); //replace
+			view_menu->hide();
+			surface->update();
+			preview_camera->set_pressed(true);
+			preview_camera->show();
+		}
+	}
 }
 
 Dictionary SpatialEditorViewport::get_state() const {
@@ -2181,6 +2193,10 @@ Dictionary SpatialEditorViewport::get_state() const {
 	d["use_environment"]=camera->get_environment().is_valid();
 	d["use_orthogonal"]=camera->get_projection()==Camera::PROJECTION_ORTHOGONAL;
 	d["listener"]=viewport->is_audio_listener();
+	if (previewing) {
+		d["previewing"]=EditorNode::get_singleton()->get_edited_scene()->get_path_to(previewing);
+	}
+
 	return d;
 }
 
diff --git a/tools/editor/plugins/sprite_region_editor_plugin.cpp b/tools/editor/plugins/sprite_region_editor_plugin.cpp
new file mode 100644
index 0000000000..35c53cf562
--- /dev/null
+++ b/tools/editor/plugins/sprite_region_editor_plugin.cpp
@@ -0,0 +1,565 @@
+/*************************************************************************/
+/*  sprite_region_editor_plugin.cpp                                      */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Author: Mariano Suligoy                                               */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#include "sprite_region_editor_plugin.h"
+#include "scene/gui/check_box.h"
+#include "os/input.h"
+#include "os/keyboard.h"
+
+void SpriteRegionEditor::_region_draw()
+{
+	Ref<Texture> base_tex = node->get_texture();
+	if (base_tex.is_null())
+		return;
+
+	Matrix32 mtx;
+	mtx.elements[2]=-draw_ofs;
+	mtx.scale_basis(Vector2(draw_zoom,draw_zoom));
+
+	VS::get_singleton()->canvas_item_set_clip(edit_draw->get_canvas_item(),true);
+	VS::get_singleton()->canvas_item_add_set_transform(edit_draw->get_canvas_item(),mtx);
+	edit_draw->draw_texture(base_tex,Point2());
+	VS::get_singleton()->canvas_item_add_set_transform(edit_draw->get_canvas_item(),Matrix32());
+
+	if (snap_show_grid) {
+		Size2 s = edit_draw->get_size();
+		int last_cell;
+
+		if (snap_step.x!=0) {
+			for(int i=0;i<s.width;i++) {
+				int cell = Math::fast_ftoi(Math::floor((mtx.affine_inverse().xform(Vector2(i,0)).x-snap_offset.x)/snap_step.x));
+				if (i==0)
+					last_cell=cell;
+				if (last_cell!=cell)
+					edit_draw->draw_line(Point2(i,0),Point2(i,s.height),Color(0.3,0.7,1,0.3));
+				last_cell=cell;
+			}
+		}
+
+		if (snap_step.y!=0) {
+			for(int i=0;i<s.height;i++) {
+				int cell = Math::fast_ftoi(Math::floor((mtx.affine_inverse().xform(Vector2(0,i)).y-snap_offset.y)/snap_step.y));
+				if (i==0)
+					last_cell=cell;
+				if (last_cell!=cell)
+					edit_draw->draw_line(Point2(0,i),Point2(s.width,i),Color(0.3,0.7,1,0.3));
+				last_cell=cell;
+			}
+		}
+	}
+
+	Ref<Texture> select_handle = get_icon("EditorHandle","EditorIcons");
+
+	Rect2 scroll_rect(Point2(),mtx.basis_xform(base_tex->get_size()));
+	scroll_rect.expand_to(mtx.basis_xform(edit_draw->get_size()));
+
+	Vector2 endpoints[4]={
+		mtx.basis_xform(rect.pos),
+		mtx.basis_xform(rect.pos+Vector2(rect.size.x,0)),
+		mtx.basis_xform(rect.pos+rect.size),
+		mtx.basis_xform(rect.pos+Vector2(0,rect.size.y))
+	};
+
+	for(int i=0;i<4;i++) {
+
+		int prev = (i+3)%4;
+		int next = (i+1)%4;
+
+		Vector2 ofs = ((endpoints[i] - endpoints[prev]).normalized() + ((endpoints[i] - endpoints[next]).normalized())).normalized();
+		ofs*=1.4144*(select_handle->get_size().width/2);
+
+		edit_draw->draw_line(endpoints[i]-draw_ofs, endpoints[next]-draw_ofs, Color(0.9,0.5,0.5), 2);
+
+		edit_draw->draw_texture(select_handle,(endpoints[i]+ofs-(select_handle->get_size()/2)).floor()-draw_ofs);
+
+		ofs = (endpoints[next]-endpoints[i])/2;
+		ofs += (endpoints[next]-endpoints[i]).tangent().normalized()*(select_handle->get_size().width/2);
+
+		edit_draw->draw_texture(select_handle,(endpoints[i]+ofs-(select_handle->get_size()/2)).floor()-draw_ofs);
+
+		scroll_rect.expand_to(endpoints[i]);
+	}
+
+	scroll_rect=scroll_rect.grow(200);
+	updating_scroll=true;
+	hscroll->set_min(scroll_rect.pos.x);
+	hscroll->set_max(scroll_rect.pos.x+scroll_rect.size.x);
+	hscroll->set_page(edit_draw->get_size().x);
+	hscroll->set_val(draw_ofs.x);
+	hscroll->set_step(0.001);
+
+	vscroll->set_min(scroll_rect.pos.y);
+	vscroll->set_max(scroll_rect.pos.y+scroll_rect.size.y);
+	vscroll->set_page(edit_draw->get_size().y);
+	vscroll->set_val(draw_ofs.y);
+	vscroll->set_step(0.001);
+	updating_scroll=false;
+}
+
+void SpriteRegionEditor::_region_input(const InputEvent& p_input)
+{
+	Matrix32 mtx;
+	mtx.elements[2]=-draw_ofs;
+	mtx.scale_basis(Vector2(draw_zoom,draw_zoom));
+
+	Vector2 endpoints[8]={
+		mtx.xform(rect.pos)+Vector2(-4,-4),
+		mtx.xform(rect.pos+Vector2(rect.size.x/2,0))+Vector2(0,-4),
+		mtx.xform(rect.pos+Vector2(rect.size.x,0))+Vector2(4,-4),
+		mtx.xform(rect.pos+Vector2(rect.size.x,rect.size.y/2))+Vector2(4,0),
+		mtx.xform(rect.pos+rect.size)+Vector2(4,4),
+		mtx.xform(rect.pos+Vector2(rect.size.x/2,rect.size.y))+Vector2(0,4),
+		mtx.xform(rect.pos+Vector2(0,rect.size.y))+Vector2(-4,4),
+		mtx.xform(rect.pos+Vector2(0,rect.size.y/2))+Vector2(-4,0)
+	};
+
+	if (p_input.type==InputEvent::MOUSE_BUTTON) {
+
+
+		const InputEventMouseButton &mb=p_input.mouse_button;
+
+		if (mb.button_index==BUTTON_LEFT) {
+
+
+			if (mb.pressed) {
+
+				drag_from=mtx.affine_inverse().xform(Vector2(mb.x,mb.y));
+				drag_from=snap_point(drag_from);
+				drag=true;
+				rect_prev=node->get_region_rect();
+
+				drag_index=-1;
+				for(int i=0;i<8;i++) {
+
+					Vector2 tuv=endpoints[i];
+					if (tuv.distance_to(Vector2(mb.x,mb.y))<8) {
+						drag_index=i;
+						creating = false;
+					}
+				}
+
+				if (drag_index==-1) {
+					creating = true;
+					rect = Rect2(drag_from,Size2());
+				}
+
+			} else if (drag) {
+
+				undo_redo->create_action("Set region_rect");
+				undo_redo->add_do_method(node,"set_region_rect",node->get_region_rect());
+				undo_redo->add_undo_method(node,"set_region_rect",rect_prev);
+				undo_redo->add_do_method(edit_draw,"update");
+				undo_redo->add_undo_method(edit_draw,"update");
+				undo_redo->commit_action();
+
+				drag=false;
+			}
+
+		} else if (mb.button_index==BUTTON_RIGHT && mb.pressed) {
+
+			if (drag) {
+				drag=false;
+				node->set_region_rect(rect_prev);
+				rect=rect_prev;
+				edit_draw->update();
+			}
+
+		} else if (mb.button_index==BUTTON_WHEEL_UP && mb.pressed) {
+
+			zoom->set_val( zoom->get_val()/0.9 );
+		} else if (mb.button_index==BUTTON_WHEEL_DOWN && mb.pressed) {
+
+			zoom->set_val( zoom->get_val()*0.9);
+		}
+
+	} else if (p_input.type==InputEvent::MOUSE_MOTION) {
+
+		const InputEventMouseMotion &mm=p_input.mouse_motion;
+
+		if (mm.button_mask&BUTTON_MASK_MIDDLE || Input::get_singleton()->is_key_pressed(KEY_SPACE)) {
+
+			Vector2 draged(mm.relative_x,mm.relative_y);
+			hscroll->set_val( hscroll->get_val()-draged.x );
+			vscroll->set_val( vscroll->get_val()-draged.y );
+
+		} else if (drag) {
+
+			Vector2 new_pos = mtx.affine_inverse().xform(Vector2(mm.x,mm.y));
+			new_pos = snap_point(new_pos);
+
+			if (creating) {
+				rect = Rect2(drag_from,Size2());
+				rect.expand_to(new_pos);
+				node->set_region_rect(rect);
+				edit_draw->update();
+				return;
+			}
+
+			switch(drag_index) {
+			case 0: {
+				Vector2 p=rect_prev.pos+rect_prev.size;
+				rect = Rect2(p,Size2());
+				rect.expand_to(new_pos);
+				node->set_region_rect(rect);
+			} break;
+			case 1: {
+				Vector2 p=rect_prev.pos+Vector2(0,rect_prev.size.y);
+				rect = Rect2(p,Size2(rect_prev.size.x,0));
+				rect.expand_to(new_pos);
+				node->set_region_rect(rect);
+			} break;
+			case 2: {
+				Vector2 p=rect_prev.pos+Vector2(0,rect_prev.size.y);
+				rect = Rect2(p,Size2());
+				rect.expand_to(new_pos);
+				node->set_region_rect(rect);
+			} break;
+			case 3: {
+				Vector2 p=rect_prev.pos;
+				rect = Rect2(p,Size2(0,rect_prev.size.y));
+				rect.expand_to(new_pos);
+				node->set_region_rect(rect);
+			} break;
+			case 4: {
+				Vector2 p=rect_prev.pos;
+				rect = Rect2(p,Size2());
+				rect.expand_to(new_pos);
+				node->set_region_rect(rect);
+			} break;
+			case 5: {
+				Vector2 p=rect_prev.pos;
+				rect = Rect2(p,Size2(rect_prev.size.x,0));
+				rect.expand_to(new_pos);
+				node->set_region_rect(rect);
+			} break;
+			case 6: {
+				Vector2 p=rect_prev.pos+Vector2(rect_prev.size.x,0);
+				rect = Rect2(p,Size2());
+				rect.expand_to(new_pos);
+				node->set_region_rect(rect);
+			} break;
+			case 7: {
+				Vector2 p=rect_prev.pos+Vector2(rect_prev.size.x,0);
+				rect = Rect2(p,Size2(0,rect_prev.size.y));
+				rect.expand_to(new_pos);
+				node->set_region_rect(rect);
+			} break;
+
+			}
+			edit_draw->update();
+		}
+
+	}
+}
+
+void SpriteRegionEditor::_scroll_changed(float)
+{
+	if (updating_scroll)
+		return;
+
+	draw_ofs.x=hscroll->get_val();
+	draw_ofs.y=vscroll->get_val();
+	draw_zoom=zoom->get_val();
+	print_line("_scroll_changed");
+	edit_draw->update();
+}
+
+void SpriteRegionEditor::_set_use_snap(bool p_use)
+{
+	use_snap=p_use;
+}
+
+void SpriteRegionEditor::_set_show_grid(bool p_show)
+{
+	snap_show_grid=p_show;
+	edit_draw->update();
+}
+
+void SpriteRegionEditor::_set_snap_off_x(float p_val)
+{
+	snap_offset.x=p_val;
+	edit_draw->update();
+}
+
+void SpriteRegionEditor::_set_snap_off_y(float p_val)
+{
+	snap_offset.y=p_val;
+	edit_draw->update();
+}
+
+void SpriteRegionEditor::_set_snap_step_x(float p_val)
+{
+	snap_step.x=p_val;
+	edit_draw->update();
+}
+
+void SpriteRegionEditor::_set_snap_step_y(float p_val)
+{
+	snap_step.y=p_val;
+	edit_draw->update();
+}
+
+void SpriteRegionEditor::_notification(int p_what)
+{
+	switch(p_what) {
+
+		case NOTIFICATION_READY: {
+			edit_node->set_icon( get_icon("RegionEdit","EditorIcons"));
+			b_snap_grid->set_icon( get_icon("Grid", "EditorIcons"));
+			b_snap_enable->set_icon( get_icon("Snap", "EditorIcons"));
+			icon_zoom->set_texture( get_icon("Zoom", "EditorIcons"));
+		} break;
+	}
+}
+
+void SpriteRegionEditor::_node_removed(Node *p_node)
+{
+	if(p_node==node) {
+		node=NULL;
+		hide();
+	}
+}
+
+void SpriteRegionEditor::_bind_methods()
+{
+	ObjectTypeDB::bind_method(_MD("_edit_node"),&SpriteRegionEditor::_edit_node);
+	ObjectTypeDB::bind_method(_MD("_region_draw"),&SpriteRegionEditor::_region_draw);
+	ObjectTypeDB::bind_method(_MD("_region_input"),&SpriteRegionEditor::_region_input);
+	ObjectTypeDB::bind_method(_MD("_scroll_changed"),&SpriteRegionEditor::_scroll_changed);
+	ObjectTypeDB::bind_method(_MD("_node_removed"),&SpriteRegionEditor::_node_removed);
+	ObjectTypeDB::bind_method(_MD("_set_use_snap"),&SpriteRegionEditor::_set_use_snap);
+	ObjectTypeDB::bind_method(_MD("_set_show_grid"),&SpriteRegionEditor::_set_show_grid);
+	ObjectTypeDB::bind_method(_MD("_set_snap_off_x"),&SpriteRegionEditor::_set_snap_off_x);
+	ObjectTypeDB::bind_method(_MD("_set_snap_off_y"),&SpriteRegionEditor::_set_snap_off_y);
+	ObjectTypeDB::bind_method(_MD("_set_snap_step_x"),&SpriteRegionEditor::_set_snap_step_x);
+	ObjectTypeDB::bind_method(_MD("_set_snap_step_y"),&SpriteRegionEditor::_set_snap_step_y);
+}
+
+void SpriteRegionEditor::edit(Node *p_sprite)
+{
+	if (p_sprite) {
+		node=p_sprite->cast_to<Sprite>();
+		node->connect("exit_tree",this,"_node_removed",varray(),CONNECT_ONESHOT);
+	} else {
+		if (node)
+			node->disconnect("exit_tree",this,"_node_removed");
+		node=NULL;
+	}
+
+}
+void SpriteRegionEditor::_edit_node()
+{
+	if (node->get_texture().is_null()) {
+
+		error->set_text("No texture in this sprite.\nSet a texture to be able to edit Region.");
+		error->popup_centered_minsize();
+		return;
+	}
+
+	rect=node->get_region_rect();
+	dlg_editor->popup_centered_ratio(0.85);
+}
+
+inline float _snap_scalar(float p_offset, float p_step, float p_target) {
+	return p_step != 0 ? Math::stepify(p_target - p_offset, p_step) + p_offset : p_target;
+}
+
+Vector2 SpriteRegionEditor::snap_point(Vector2 p_target) const {
+	if (use_snap) {
+		p_target.x = _snap_scalar(snap_offset.x, snap_step.x, p_target.x);
+		p_target.y = _snap_scalar(snap_offset.y, snap_step.y, p_target.y);
+	}
+	p_target = p_target.snapped(Size2(1, 1));
+
+	return p_target;
+}
+
+SpriteRegionEditor::SpriteRegionEditor(EditorNode* p_editor)
+{
+	node=NULL;
+	editor=p_editor;
+	undo_redo = editor->get_undo_redo();
+
+	snap_step=Vector2(10,10);
+	use_snap=false;
+	snap_show_grid=false;
+
+	add_child( memnew( VSeparator ));
+	edit_node = memnew( ToolButton );
+	add_child(edit_node);
+	edit_node->connect("pressed",this,"_edit_node");
+
+	dlg_editor = memnew( AcceptDialog );
+	add_child(dlg_editor);
+	dlg_editor->set_title("Sprite Region Editor");
+	dlg_editor->set_self_opacity(0.9);
+
+	VBoxContainer *main_vb = memnew( VBoxContainer );
+	dlg_editor->add_child(main_vb);
+	dlg_editor->set_child_rect(main_vb);
+	HBoxContainer *hb_tools = memnew( HBoxContainer );
+	main_vb->add_child(hb_tools);
+
+	b_snap_enable = memnew( ToolButton );
+	hb_tools->add_child(b_snap_enable);
+	b_snap_enable->set_text("Snap");
+	b_snap_enable->set_focus_mode(FOCUS_NONE);
+	b_snap_enable->set_toggle_mode(true);
+	b_snap_enable->set_pressed(use_snap);
+	b_snap_enable->set_tooltip("Enable Snap");
+	b_snap_enable->connect("toggled",this,"_set_use_snap");
+
+	b_snap_grid = memnew( ToolButton );
+	hb_tools->add_child(b_snap_grid);
+	b_snap_grid->set_text("Grid");
+	b_snap_grid->set_focus_mode(FOCUS_NONE);
+	b_snap_grid->set_toggle_mode(true);
+	b_snap_grid->set_pressed(snap_show_grid);
+	b_snap_grid->set_tooltip("Show Grid");
+	b_snap_grid->connect("toggled",this,"_set_show_grid");
+
+	hb_tools->add_child( memnew( VSeparator ));
+	hb_tools->add_child( memnew( Label("Grid Offset:") ) );
+
+	SpinBox *sb_off_x = memnew( SpinBox );
+	sb_off_x->set_min(-256);
+	sb_off_x->set_max(256);
+	sb_off_x->set_step(1);
+	sb_off_x->set_val(snap_offset.x);
+	sb_off_x->set_suffix("px");
+	sb_off_x->connect("value_changed", this, "_set_snap_off_x");
+	hb_tools->add_child(sb_off_x);
+
+	SpinBox *sb_off_y = memnew( SpinBox );
+	sb_off_y->set_min(-256);
+	sb_off_y->set_max(256);
+	sb_off_y->set_step(1);
+	sb_off_y->set_val(snap_offset.y);
+	sb_off_y->set_suffix("px");
+	sb_off_y->connect("value_changed", this, "_set_snap_off_y");
+	hb_tools->add_child(sb_off_y);
+
+	hb_tools->add_child( memnew( VSeparator ));
+	hb_tools->add_child( memnew( Label("Grid Step:") ) );
+
+	SpinBox *sb_step_x = memnew( SpinBox );
+	sb_step_x->set_min(-256);
+	sb_step_x->set_max(256);
+	sb_step_x->set_step(1);
+	sb_step_x->set_val(snap_step.x);
+	sb_step_x->set_suffix("px");
+	sb_step_x->connect("value_changed", this, "_set_snap_step_x");
+	hb_tools->add_child(sb_step_x);
+
+	SpinBox *sb_step_y = memnew( SpinBox );
+	sb_step_y->set_min(-256);
+	sb_step_y->set_max(256);
+	sb_step_y->set_step(1);
+	sb_step_y->set_val(snap_step.y);
+	sb_step_y->set_suffix("px");
+	sb_step_y->connect("value_changed", this, "_set_snap_step_y");
+	hb_tools->add_child(sb_step_y);
+
+//	MARIANOGNU::TODO: Add more tools?
+
+	HBoxContainer *main_hb = memnew( HBoxContainer );
+	main_vb->add_child(main_hb);
+	edit_draw = memnew( Control );
+	main_hb->add_child(edit_draw);
+	main_hb->set_v_size_flags(SIZE_EXPAND_FILL);
+	edit_draw->set_h_size_flags(SIZE_EXPAND_FILL);
+
+
+	hb_tools->add_child( memnew( VSeparator ));
+	icon_zoom = memnew( TextureFrame );
+	hb_tools->add_child(icon_zoom);
+
+	zoom = memnew( HSlider );
+	zoom->set_min(0.01);
+	zoom->set_max(4);
+	zoom->set_val(1);
+	zoom->set_step(0.01);
+	hb_tools->add_child(zoom);
+	zoom->set_custom_minimum_size(Size2(200,0));
+	zoom_value = memnew( SpinBox );
+	zoom->share(zoom_value);
+	zoom_value->set_custom_minimum_size(Size2(50,0));
+	hb_tools->add_child(zoom_value);
+	zoom->connect("value_changed",this,"_scroll_changed");
+
+
+
+	vscroll = memnew( VScrollBar);
+	main_hb->add_child(vscroll);
+	vscroll->connect("value_changed",this,"_scroll_changed");
+	hscroll = memnew( HScrollBar );
+	main_vb->add_child(hscroll);
+	hscroll->connect("value_changed",this,"_scroll_changed");
+
+	edit_draw->connect("draw",this,"_region_draw");
+	edit_draw->connect("input_event",this,"_region_input");
+	draw_zoom=1.0;
+	updating_scroll=false;
+
+	error = memnew( AcceptDialog);
+	add_child(error);
+
+}
+
+void SpriteRegionEditorPlugin::edit(Object *p_node)
+{
+	region_editor->edit(p_node->cast_to<Node>());
+}
+
+bool SpriteRegionEditorPlugin::handles(Object *p_node) const
+{
+	return p_node->is_type("Sprite");
+}
+
+void SpriteRegionEditorPlugin::make_visible(bool p_visible)
+{
+	if (p_visible) {
+		region_editor->show();
+	} else {
+		region_editor->hide();
+		region_editor->edit(NULL);
+	}
+}
+
+SpriteRegionEditorPlugin::SpriteRegionEditorPlugin(EditorNode *p_node)
+{
+	editor = p_node;
+	region_editor= memnew ( SpriteRegionEditor(p_node) );
+	CanvasItemEditor::get_singleton()->add_control_to_menu_panel(region_editor);
+
+	region_editor->hide();
+}
+
diff --git a/tools/editor/plugins/sprite_region_editor_plugin.h b/tools/editor/plugins/sprite_region_editor_plugin.h
new file mode 100644
index 0000000000..cf69395f40
--- /dev/null
+++ b/tools/editor/plugins/sprite_region_editor_plugin.h
@@ -0,0 +1,125 @@
+/*************************************************************************/
+/*  sprite_region_editor_plugin.h                                        */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Author: Mariano Suligoy                                               */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+
+#ifndef SPRITE_REGION_EDITOR_PLUGIN_H
+#define SPRITE_REGION_EDITOR_PLUGIN_H
+
+#include "canvas_item_editor_plugin.h"
+#include "tools/editor/editor_plugin.h"
+#include "tools/editor/editor_node.h"
+#include "scene/2d/sprite.h"
+
+class SpriteRegionEditor : public HBoxContainer {
+
+	OBJ_TYPE(SpriteRegionEditor, HBoxContainer );
+
+	ToolButton *edit_node;
+//	Button *use_region;
+	ToolButton *b_snap_enable;
+	ToolButton *b_snap_grid;
+	TextureFrame *icon_zoom;
+	HSlider *zoom;
+	SpinBox *zoom_value;
+	Control *edit_draw;
+
+	VScrollBar *vscroll;
+	HScrollBar *hscroll;
+
+	Sprite *node;
+	EditorNode *editor;
+	AcceptDialog *dlg_editor;
+	UndoRedo* undo_redo;
+
+	Vector2 draw_ofs;
+	float draw_zoom;
+	bool updating_scroll;
+
+	bool use_snap;
+	bool snap_show_grid;
+	Vector2 snap_offset;
+	Vector2 snap_step;
+
+	Rect2 rect;
+	Rect2 rect_prev;
+	bool drag;
+	bool creating;
+	Vector2 drag_from;
+	int drag_index;
+
+	AcceptDialog *error;
+
+	void _set_use_snap(bool p_use);
+	void _set_show_grid(bool p_show);
+	void _set_snap_off_x(float p_val);
+	void _set_snap_off_y(float p_val);
+	void _set_snap_step_x(float p_val);
+	void _set_snap_step_y(float p_val);
+
+protected:
+
+	void _notification(int p_what);
+	void _node_removed(Node *p_node);
+	static void _bind_methods();
+
+	Vector2 snap_point(Vector2 p_target) const;
+
+public:
+
+	void edit();
+	void _edit_node();
+	void _region_draw();
+	void _region_input(const InputEvent &p_input);
+	void _scroll_changed(float);
+
+	void edit(Node *p_sprite);
+	SpriteRegionEditor(EditorNode* p_editor);
+
+};
+
+class SpriteRegionEditorPlugin : public EditorPlugin
+{
+
+	OBJ_TYPE( SpriteRegionEditorPlugin, EditorPlugin );
+
+	SpriteRegionEditor *region_editor;
+	EditorNode *editor;
+public:
+
+	virtual String get_name() const { return "Sprite"; }
+	bool has_main_screen() const { return false; }
+	virtual void edit(Object *p_node);
+	virtual bool handles(Object *p_node) const;
+	virtual void make_visible(bool p_visible);
+
+	SpriteRegionEditorPlugin(EditorNode *p_node);
+};
+
+#endif // SPRITE_REGION_EDITOR_PLUGIN_H
diff --git a/tools/editor/plugins/tile_map_editor_plugin.cpp b/tools/editor/plugins/tile_map_editor_plugin.cpp
index 017a26441d..66c7a39096 100644
--- a/tools/editor/plugins/tile_map_editor_plugin.cpp
+++ b/tools/editor/plugins/tile_map_editor_plugin.cpp
@@ -107,8 +107,8 @@ void TileMapEditor::_set_cell(const Point2i& p_pos,int p_value,bool p_flip_h, bo
 
 
 	if (p_with_undo) {
-		undo_redo->add_do_method(this,"_set_cell_shortened",Point2(p_pos),p_value,p_flip_h,p_flip_v,p_transpose);
-		undo_redo->add_undo_method(this,"_set_cell_shortened",Point2(p_pos),prev_val,prev_flip_h,prev_flip_v,prev_transpose);
+		undo_redo->add_do_method(node,"set_cellv",Point2(p_pos),p_value,p_flip_h,p_flip_v,p_transpose);
+		undo_redo->add_undo_method(node,"set_cellv",Point2(p_pos),prev_val,prev_flip_h,prev_flip_v,prev_transpose);
 	} else {
 
 		node->set_cell(p_pos.x,p_pos.y,p_value,p_flip_h,p_flip_v,p_transpose);
@@ -314,8 +314,8 @@ bool TileMapEditor::forward_input_event(const InputEvent& p_event) {
 								for(Map<Point2i,CellOp>::Element *E=paint_undo.front();E;E=E->next()) {
 
 									Point2i p=E->key();
-									undo_redo->add_do_method(this,"_set_cell_shortened",Point2(p),node->get_cell(p.x,p.y),node->is_cell_x_flipped(p.x,p.y),node->is_cell_y_flipped(p.x,p.y),node->is_cell_transposed(p.x,p.y));
-									undo_redo->add_undo_method(this,"_set_cell_shortened",Point2(p),E->get().idx,E->get().xf,E->get().yf,E->get().tr);
+									undo_redo->add_do_method(node,"set_cellv",Point2(p),node->get_cell(p.x,p.y),node->is_cell_x_flipped(p.x,p.y),node->is_cell_y_flipped(p.x,p.y),node->is_cell_transposed(p.x,p.y));
+									undo_redo->add_undo_method(node,"set_cellv",Point2(p),E->get().idx,E->get().xf,E->get().yf,E->get().tr);
 								}
 
 								undo_redo->commit_action();
@@ -344,7 +344,7 @@ bool TileMapEditor::forward_input_event(const InputEvent& p_event) {
 					//return true;
 					_set_cell(local,TileMap::INVALID_CELL);
 					return true;
-				} else {
+				} else if (!mb.pressed) {
 
 					if (tool==TOOL_ERASING) {
 
@@ -353,9 +353,10 @@ bool TileMapEditor::forward_input_event(const InputEvent& p_event) {
 							for(Map<Point2i,CellOp>::Element *E=paint_undo.front();E;E=E->next()) {
 
 								Point2i p=E->key();
-								//undo_redo->add_do_method(node,"set_cell",p.x,p.y,node->get_cell(p.x,p.y),node->is_cell_x_flipped(p.x,p.y),node->is_cell_y_flipped(p.x,p.y),node->is_cell_transposed(p.x,p.y));
-								_set_cell(p,TileMap::INVALID_CELL,false,false,false,true);
-								undo_redo->add_undo_method(this,"_set_cell_shortened",Point2(p),E->get().idx,E->get().xf,E->get().yf,E->get().tr);
+								//undo_redo->add_do_method(node,"set_cell",p,node->get_cell(p.x,p.y),node->is_cell_x_flipped(p.x,p.y),node->is_cell_y_flipped(p.x,p.y),node->is_cell_transposed(p.x,p.y));
+								//_set_cell(p,TileMap::INVALID_CELL,false,false,false,true);
+								undo_redo->add_do_method(node,"set_cellv",Point2(p),TileMap::INVALID_CELL,false,false,false);
+								undo_redo->add_undo_method(node,"set_cellv",Point2(p),E->get().idx,E->get().xf,E->get().yf,E->get().tr);
 							}
 
 							undo_redo->commit_action();
diff --git a/tools/editor/project_export.cpp b/tools/editor/project_export.cpp
index a087f23c25..6003b976aa 100644
--- a/tools/editor/project_export.cpp
+++ b/tools/editor/project_export.cpp
@@ -80,7 +80,7 @@ bool ProjectExportDialog::_create_tree(TreeItem *p_parent,EditorFileSystemDirect
 		String path = p_dir->get_file_path(i);
 		fitem->set_tooltip(0,path);
 		fitem->set_metadata(0,path);
-		Ref<Texture> icon = get_icon( (has_icon(p_dir->get_file_type(i),"EditorIcons")?p_dir->get_file_type(i):String("Object")),"EditorIcons");
+		Ref<Texture> icon = get_icon( (has_icon(p_dir->get_file_type(i),ei)?p_dir->get_file_type(i):ot),ei);
 		fitem->set_icon(0,icon);
 
 		fitem->set_cell_mode(1,TreeItem::CELL_MODE_RANGE);
@@ -1156,7 +1156,7 @@ ProjectExportDialog::ProjectExportDialog(EditorNode *p_editor) {
 	image_shrink = memnew( SpinBox );
 	image_shrink->set_min(1);
 	image_shrink->set_max(8);
-	image_shrink->set_step(1);
+	image_shrink->set_step(0.1);
 	image_vb->add_margin_child("Shrink All Images:",image_shrink);
 	sections->add_child(image_vb);
 
@@ -1216,6 +1216,7 @@ ProjectExportDialog::ProjectExportDialog(EditorNode *p_editor) {
 	group_image_action->add_item("Default");
 	group_image_action->add_item("Compress Disk");
 	group_image_action->add_item("Compress RAM");
+	group_image_action->add_item("Keep Original");
 	group_options->add_margin_child("Compress Mode:",group_image_action);
 	group_image_action->connect("item_selected",this,"_group_changed");
 
@@ -1236,7 +1237,7 @@ ProjectExportDialog::ProjectExportDialog(EditorNode *p_editor) {
 	group_shrink->set_min(1);
 	group_shrink->set_max(8);
 	group_shrink->set_val(1);
-	group_shrink->set_step(1);
+	group_shrink->set_step(0.001);
 	group_options->add_margin_child("Shrink By:",group_shrink);
 	group_shrink->connect("value_changed",this,"_group_changed");
 
@@ -1372,6 +1373,8 @@ ProjectExportDialog::ProjectExportDialog(EditorNode *p_editor) {
 	button_export = add_button("Export..",!OS::get_singleton()->get_swap_ok_cancel(),"export_pck");
 	updating_script=false;
 
+	ei="EditorIcons";
+	ot="Object";
 
 }
 
diff --git a/tools/editor/project_export.h b/tools/editor/project_export.h
index c88233ae01..d85e688e58 100644
--- a/tools/editor/project_export.h
+++ b/tools/editor/project_export.h
@@ -78,6 +78,9 @@ private:
 	HBoxContainer *plat_errors;
 	Label *platform_error_string;
 
+	StringName ei;
+	StringName ot;
+
 	Tree * tree;
 
 	EditorFileDialog *pck_export;
diff --git a/tools/editor/project_manager.cpp b/tools/editor/project_manager.cpp
index f1eecd53b0..9f47291433 100644
--- a/tools/editor/project_manager.cpp
+++ b/tools/editor/project_manager.cpp
@@ -245,7 +245,8 @@ public:
 		project_name->clear();
 
 		if (import_mode) {
-			set_title("Import Existing Project:");
+			set_title("Import Existing Project");
+			get_ok()->set_text("Import");
 			pp->set_text("Project Path: (Must exist)");
 			pn->set_text("Project Name:");
 			pn->hide();
@@ -254,7 +255,8 @@ public:
 			popup_centered(Size2(500,125));
 
 		} else {
-			set_title("Create New Project:");
+			set_title("Create New Project");
+			get_ok()->set_text("Create");
 			pp->set_text("Project Path:");
 			pn->set_text("Project Name:");
 			pn->show();
@@ -313,7 +315,6 @@ public:
 		l->add_color_override("font_color",Color(1,0.4,0.3,0.8));
 		l->set_align(Label::ALIGN_CENTER);
 
-		get_ok()->set_text("Create");
 		DirAccess *d = DirAccess::create(DirAccess::ACCESS_FILESYSTEM);
 		project_path->set_text(d->get_current_dir());
 		memdelete(d);
diff --git a/tools/editor/project_settings.cpp b/tools/editor/project_settings.cpp
index fea9c705ef..25a2750166 100644
--- a/tools/editor/project_settings.cpp
+++ b/tools/editor/project_settings.cpp
@@ -771,18 +771,47 @@ void ProjectSettings::_autoload_add() {
 
 void ProjectSettings::_autoload_delete(Object *p_item,int p_column, int p_button) {
 
+
 	TreeItem *ti=p_item->cast_to<TreeItem>();
 	String name = "autoload/"+ti->get_text(0);
 
-	undo_redo->create_action("Remove Autoload");
-	undo_redo->add_do_property(Globals::get_singleton(),name,Variant());
-	undo_redo->add_undo_property(Globals::get_singleton(),name,Globals::get_singleton()->get(name));
-	undo_redo->add_undo_method(Globals::get_singleton(),"set_persisting",name,true);
-	undo_redo->add_do_method(this,"_update_autoload");
-	undo_redo->add_undo_method(this,"_update_autoload");
-	undo_redo->add_do_method(this,"_settings_changed");
-	undo_redo->add_undo_method(this,"_settings_changed");
-	undo_redo->commit_action();
+	if (p_button==0) {
+		//delete
+		undo_redo->create_action("Remove Autoload");
+		undo_redo->add_do_property(Globals::get_singleton(),name,Variant());
+		undo_redo->add_undo_property(Globals::get_singleton(),name,Globals::get_singleton()->get(name));
+		undo_redo->add_undo_method(Globals::get_singleton(),"set_persisting",name,true);
+		undo_redo->add_do_method(this,"_update_autoload");
+		undo_redo->add_undo_method(this,"_update_autoload");
+		undo_redo->add_do_method(this,"_settings_changed");
+		undo_redo->add_undo_method(this,"_settings_changed");
+		undo_redo->commit_action();
+	} else {
+
+		TreeItem *swap;
+
+		if (p_button==1) {
+			swap=ti->get_prev();
+		} else if (p_button==2) {
+			swap=ti->get_next();
+		}
+		if (!swap)
+			return;
+
+		String swap_name= "autoload/"+swap->get_text(0);
+
+		undo_redo->create_action("Move Autoload");
+		undo_redo->add_do_method(Globals::get_singleton(),"set_order",swap_name,Globals::get_singleton()->get_order(name));
+		undo_redo->add_do_method(Globals::get_singleton(),"set_order",name,Globals::get_singleton()->get_order(swap_name));
+		undo_redo->add_undo_method(Globals::get_singleton(),"set_order",swap_name,Globals::get_singleton()->get_order(swap_name));
+		undo_redo->add_undo_method(Globals::get_singleton(),"set_order",name,Globals::get_singleton()->get_order(name));
+		undo_redo->add_do_method(this,"_update_autoload");
+		undo_redo->add_undo_method(this,"_update_autoload");
+		undo_redo->add_do_method(this,"_settings_changed");
+		undo_redo->add_undo_method(this,"_settings_changed");
+		undo_redo->commit_action();
+
+	}
 
 }
 
@@ -1134,6 +1163,8 @@ void ProjectSettings::_update_autoload() {
 		TreeItem *t = autoload_list->create_item(root);
 		t->set_text(0,name);
 		t->set_text(1,Globals::get_singleton()->get(pi.name));
+		t->add_button(1,get_icon("MoveUp","EditorIcons"),1);
+		t->add_button(1,get_icon("MoveDown","EditorIcons"),2);
 		t->add_button(1,get_icon("Del","EditorIcons"),0);
 
 	}
diff --git a/tools/editor/property_editor.cpp b/tools/editor/property_editor.cpp
index 955c426d2b..549a3f7ffb 100644
--- a/tools/editor/property_editor.cpp
+++ b/tools/editor/property_editor.cpp
@@ -39,17 +39,22 @@
 #include "editor_settings.h"
 #include "editor_import_export.h"
 #include "editor_node.h"
+#include "multi_node_edit.h"
+#include "array_property_edit.h"
+#include "editor_help.h"
+#include "scene/resources/packed_scene.h"
+
 
 void CustomPropertyEditor::_notification(int p_what) {
-	
+
 
 	if (p_what==NOTIFICATION_DRAW) {
-		
+
 		RID ci = get_canvas_item();
-		get_stylebox("panel","PopupMenu")->draw(ci,Rect2(Point2(),get_size()));		
+		get_stylebox("panel","PopupMenu")->draw(ci,Rect2(Point2(),get_size()));
 		/*
 		if (v.get_type()==Variant::COLOR) {
-			
+
 			VisualServer::get_singleton()->canvas_item_add_rect(ci, Rect2( 10,10,60, get_size().height-20 ), v );
 		}*/
 	}
@@ -210,11 +215,11 @@ void CustomPropertyEditor::_menu_option(int p_which) {
 }
 
 Variant CustomPropertyEditor::get_variant() const {
-	
-	return v;	
+
+	return v;
 }
 String CustomPropertyEditor::get_name() const {
-	
+
 	return name;
 }
 
@@ -232,9 +237,11 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty
 	inheritors_array.clear();
 	text_edit->hide();
 	easing_draw->hide();
-	
+	spinbox->hide();
+	slider->hide();
+
 	for (int i=0;i<MAX_VALUE_EDITORS;i++) {
-		
+
 		value_editor[i]->hide();
 		value_label[i]->hide();
 		if (i<4)
@@ -242,8 +249,8 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty
 	}
 
 	for (int i=0;i<MAX_ACTION_BUTTONS;i++) {
-	
-		action_buttons[i]->hide();	
+
+		action_buttons[i]->hide();
 	}
 
 	for(int i=0;i<20;i++)
@@ -253,11 +260,49 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty
 
 
 	switch(type) {
-	
+
 		case Variant::INT:
 		case Variant::REAL: {
 
-			if (hint==PROPERTY_HINT_ALL_FLAGS) {
+			if (hint==PROPERTY_HINT_RANGE) {
+
+				int c = hint_text.get_slice_count(",");
+				float min=0,max=100,step=1;
+				if (c>=1) {
+
+					if (!hint_text.get_slice(",",0).empty())
+						min=hint_text.get_slice(",",0).to_double();
+				}
+				if (c>=2) {
+
+					if (!hint_text.get_slice(",",1).empty())
+					max=hint_text.get_slice(",",1).to_double();
+				}
+
+				if (type==Variant::REAL && c>=3) {
+
+					if (!hint_text.get_slice(",",2).empty())
+					step= hint_text.get_slice(",",2).to_double();
+				}
+
+				if (c>=4 && hint_text.get_slice(",",3)=="slider") {
+					slider->set_min(min);
+					slider->set_max(max);
+					slider->set_step((type==Variant::REAL) ? step : 1);
+					slider->set_val(v);
+					slider->show();
+					set_size(Size2(110,30));
+				} else {
+					spinbox->set_min(min);
+					spinbox->set_max(max);
+					spinbox->set_step((type==Variant::REAL) ? step : 1);
+					spinbox->set_val(v);
+					spinbox->show();
+					set_size(Size2(70,35));
+				}
+
+
+			} else if (hint==PROPERTY_HINT_ALL_FLAGS) {
 
 				uint32_t flgs = v;
 				for(int i=0;i<2;i++) {
@@ -405,7 +450,7 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty
 			value_editor[3]->set_text( String::num( r.size.y) );
 		} break;
 		case Variant::VECTOR3: {
-			
+
 			List<String> names;
 			names.push_back("x");
 			names.push_back("y");
@@ -417,7 +462,7 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty
 			value_editor[2]->set_text( String::num( vec.z) );
 		} break;
 		case Variant::PLANE: {
-			
+
 			List<String> names;
 			names.push_back("x");
 			names.push_back("y");
@@ -429,10 +474,10 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty
 			value_editor[1]->set_text( String::num( plane.normal.y ) );
 			value_editor[2]->set_text( String::num( plane.normal.z ) );
 			value_editor[3]->set_text( String::num( plane.d ) );
-			
+
 		} break;
 		case Variant::QUAT: {
-			
+
 			List<String> names;
 			names.push_back("x");
 			names.push_back("y");
@@ -447,7 +492,7 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty
 
 		} break;
 		case Variant::_AABB: {
-			
+
 			List<String> names;
 			names.push_back("px");
 			names.push_back("py");
@@ -456,7 +501,7 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty
 			names.push_back("sy");
 			names.push_back("sz");
 			config_value_editors(6,3,16,names);
-			
+
 			AABB aabb=v;
 			value_editor[0]->set_text( String::num( aabb.pos.x ) );
 			value_editor[1]->set_text( String::num( aabb.pos.y ) );
@@ -464,7 +509,7 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty
 			value_editor[3]->set_text( String::num( aabb.size.x ) );
 			value_editor[4]->set_text( String::num( aabb.size.y ) );
 			value_editor[5]->set_text( String::num( aabb.size.z ) );
-			
+
 		} break;
 		case Variant::MATRIX32: {
 
@@ -485,7 +530,7 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty
 
 		} break;
 		case Variant::MATRIX3: {
-			
+
 			List<String> names;
 			names.push_back("xx");
 			names.push_back("xy");
@@ -497,17 +542,17 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty
 			names.push_back("zy");
 			names.push_back("zz");
 			config_value_editors(9,3,16,names);
-			
+
 			Matrix3 basis=v;
 			for(int i=0;i<9;i++) {
-				
+
 				value_editor[i]->set_text( String::num( basis.elements[i/3][i%3] ) );
 			}
-			
+
 		} break;
 		case Variant::TRANSFORM: {
-			
-			
+
+
 			List<String> names;
 			names.push_back("xx");
 			names.push_back("xy");
@@ -522,20 +567,20 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty
 			names.push_back("zz");
 			names.push_back("zo");
 			config_value_editors(12,4,16,names);
-			
+
 			Transform tr=v;
 			for(int i=0;i<9;i++) {
-				
+
 				value_editor[(i/3)*4+i%3]->set_text( String::num( tr.basis.elements[i/3][i%3] ) );
 			}
-			
+
 			value_editor[3]->set_text( String::num( tr.origin.x ) );
 			value_editor[7]->set_text( String::num( tr.origin.y ) );
 			value_editor[11]->set_text( String::num( tr.origin.z ) );
-			
+
 		} break;
 		case Variant::COLOR: {
-			
+
 
 			color_picker->show();
 			color_picker->set_edit_alpha(hint!=PROPERTY_HINT_COLOR_NO_ALPHA);
@@ -549,13 +594,13 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty
 			float values[4]={c.r,c.g,c.b,c.a};
 			for (int i=0;i<4;i++) {
 				int y=m+i*h;
-				
+
 				value_editor[i]->show();
-				value_label[i]->show();				
+				value_label[i]->show();
 				value_label[i]->set_pos(Point2(ofs,y));
 				scroll[i]->set_min(0);
 				scroll[i]->set_max(1.0);
-				scroll[i]->set_page(0);		
+				scroll[i]->set_page(0);
 				scroll[i]->set_pos(Point2(ofs+15,y+Math::floor((h-scroll[i]->get_minimum_size().height)/2.0)));
 				scroll[i]->set_val(values[i]);
 				scroll[i]->set_size(Size2(120,1));
@@ -563,30 +608,30 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty
 				value_editor[i]->set_pos(Point2(ofs+140,y));
 				value_editor[i]->set_size(Size2(40,h));
 				value_editor[i]->set_text( String::num(values[i],2 ));
-				
+
 			}
-			
+
 			value_label[0]->set_text("R");
 			value_label[1]->set_text("G");
 			value_label[2]->set_text("B");
 			value_label[3]->set_text("A");
-			
+
 			Size2 new_size = value_editor[3]->get_pos() + value_editor[3]->get_size() + Point2(10,10);
 			set_size( new_size );
 			*/
-			
+
 		} break;
 		case Variant::IMAGE: {
-			
+
 			List<String> names;
 			names.push_back("New");
 			names.push_back("Load");
 			names.push_back("Clear");
 			config_action_buttons(names);
-			
+
 		} break;
 		case Variant::NODE_PATH: {
-			
+
 			List<String> names;
 			names.push_back("Assign");
 			names.push_back("Clear");
@@ -594,7 +639,7 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty
 
 		} break;
 		case Variant::OBJECT: {
-			
+
 			if (hint!=PROPERTY_HINT_RESOURCE_TYPE)
 				break;
 
@@ -700,40 +745,40 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty
 
 		} break;
 		case Variant::INPUT_EVENT: {
-			
-			
+
+
 		} break;
 		case Variant::DICTIONARY: {
-			
-			
+
+
 		} break;
 		case Variant::RAW_ARRAY: {
-			
-			
+
+
 		} break;
 		case Variant::INT_ARRAY: {
-			
-			
+
+
 		} break;
 		case Variant::REAL_ARRAY: {
-			
-			
+
+
 		} break;
 		case Variant::STRING_ARRAY: {
-			
-			
+
+
 		} break;
 		case Variant::VECTOR3_ARRAY: {
-			
-			
+
+
 		} break;
 		case Variant::COLOR_ARRAY: {
-			
-			
+
+
 		} break;
 		default: {}
-	}		
-	
+	}
+
 	updating=false;
 	return true;
 }
@@ -741,7 +786,7 @@ bool CustomPropertyEditor::edit(Object* p_owner,const String& p_name,Variant::Ty
 void CustomPropertyEditor::_file_selected(String p_file) {
 
 	switch(type) {
-		
+
 		case Variant::STRING: {
 
 			if (hint==PROPERTY_HINT_FILE || hint==PROPERTY_HINT_DIR) {
@@ -879,9 +924,9 @@ void CustomPropertyEditor::_node_path_selected(NodePath p_path) {
 void CustomPropertyEditor::_action_pressed(int p_which) {
 
 
-	if (updating) 
+	if (updating)
 		return;
-	
+
 	switch(type) {
 		case Variant::INT: {
 
@@ -964,7 +1009,7 @@ void CustomPropertyEditor::_action_pressed(int p_which) {
 
 		} break;
 		case Variant::NODE_PATH: {
-				
+
 			if (p_which==0) {
 
 
@@ -975,60 +1020,60 @@ void CustomPropertyEditor::_action_pressed(int p_which) {
 
 				v=NodePath();
 				emit_signal("variant_changed");
-			}				
+			}
 		} break;
 		case Variant::OBJECT: {
-		
+
 			if (p_which==0) {
-			
+
 
 				ERR_FAIL_COND( inheritors_array.empty() );
 
 				String intype=inheritors_array[0];
 
-				
+
 				if (hint==PROPERTY_HINT_RESOURCE_TYPE) {
-				
+
 					Object *obj = ObjectTypeDB::instance(intype);
 					ERR_BREAK( !obj );
 					Resource *res=obj->cast_to<Resource>();
 					ERR_BREAK( !res );
-					
+
 					v=Ref<Resource>(res).get_ref_ptr();
 					emit_signal("variant_changed");
 					hide();
-						
+
 				}
 			} else if (p_which==1) {
-			
+
 				file->set_access(EditorFileDialog::ACCESS_RESOURCES);
 				file->set_mode(EditorFileDialog::MODE_OPEN_FILE);
 				List<String> extensions;
 				String type=(hint==PROPERTY_HINT_RESOURCE_TYPE)?hint_text:String();
-				
+
 				ResourceLoader::get_recognized_extensions_for_type(type,&extensions);
 				file->clear_filters();
 				for (List<String>::Element *E=extensions.front();E;E=E->next()) {
-				
+
 					file->add_filter("*."+E->get()+" ; "+E->get().to_upper() );
-				
+
 				}
-				
+
 				file->popup_centered_ratio();
-			
+
 			} else if (p_which==2) {
-			
+
 				RefPtr RefPtr=v;
 
 				if (!RefPtr.is_null()) {
 
 					emit_signal("resource_edit_request");
-					hide();	
+					hide();
 				}
-			
+
 			} else if (p_which==3) {
-			
-			
+
+
 				v=Variant();
 				emit_signal("variant_changed");
 				hide();
@@ -1071,7 +1116,7 @@ void CustomPropertyEditor::_action_pressed(int p_which) {
 				emit_signal("variant_changed");
 				hide();
 			}
-				
+
 		} break;
 		case Variant::IMAGE: {
 
@@ -1110,16 +1155,16 @@ void CustomPropertyEditor::_action_pressed(int p_which) {
 }
 
 void CustomPropertyEditor::_scroll_modified(double p_value) {
-	
-	if (updating) 
+
+	if (updating)
 		return;
 	/*
 	switch(type) {
-		
+
 		case Variant::COLOR: {
-			
+
 			for (int i=0;i<4;i++) {
-				
+
 				value_editor[i]->set_text( String::num(scroll[i]->get_val(),2) );
 			}
 			Color c;
@@ -1144,7 +1189,7 @@ void CustomPropertyEditor::_drag_easing(const InputEvent& p_ev) {
 
 		float rel = p_ev.mouse_motion.relative_x;
 		if (rel==0)
-		    return;
+			return;
 
 		bool flip=hint_text=="attenuation";
 
@@ -1227,7 +1272,7 @@ void CustomPropertyEditor::_text_edit_changed() {
 }
 
 void CustomPropertyEditor::_modified(String p_string) {
-	
+
 	if (updating)
 		return;
 	updating=true;
@@ -1268,17 +1313,17 @@ void CustomPropertyEditor::_modified(String p_string) {
 		} break;
 
 		case Variant::VECTOR3: {
-			
+
 			Vector3 vec;
 			vec.x=value_editor[0]->get_text().to_double();
 			vec.y=value_editor[1]->get_text().to_double();
 			vec.z=value_editor[2]->get_text().to_double();
 			v=vec;
 			emit_signal("variant_changed");
-			
+
 		} break;
 		case Variant::PLANE: {
-			
+
 			Plane pl;
 			pl.normal.x=value_editor[0]->get_text().to_double();
 			pl.normal.y=value_editor[1]->get_text().to_double();
@@ -1286,10 +1331,10 @@ void CustomPropertyEditor::_modified(String p_string) {
 			pl.d=value_editor[3]->get_text().to_double();
 			v=pl;
 			emit_signal("variant_changed");
-			
+
 		} break;
 		case Variant::QUAT: {
-			
+
 			Quat q;
 			q.x=value_editor[0]->get_text().to_double();
 			q.y=value_editor[1]->get_text().to_double();
@@ -1297,10 +1342,10 @@ void CustomPropertyEditor::_modified(String p_string) {
 			q.w=value_editor[3]->get_text().to_double();
 			v=q;
 			emit_signal("variant_changed");
-			
+
 		} break;
 		case Variant::_AABB: {
-			
+
 			Vector3 pos;
 			pos.x=value_editor[0]->get_text().to_double();
 			pos.y=value_editor[1]->get_text().to_double();
@@ -1309,10 +1354,10 @@ void CustomPropertyEditor::_modified(String p_string) {
 			size.x=value_editor[3]->get_text().to_double();
 			size.y=value_editor[4]->get_text().to_double();
 			size.z=value_editor[5]->get_text().to_double();
-			
+
 			v=AABB(pos,size);
 			emit_signal("variant_changed");
-			
+
 		} break;
 		case Variant::MATRIX32: {
 
@@ -1327,39 +1372,39 @@ void CustomPropertyEditor::_modified(String p_string) {
 
 		} break;
 		case Variant::MATRIX3: {
-			
+
 			Matrix3 m;
 			for(int i=0;i<9;i++) {
-					
+
 				m.elements[i/3][i%3]=value_editor[i]->get_text().to_double();
 			}
-			
+
 			v=m;
 			emit_signal("variant_changed");
-			
+
 		} break;
 		case Variant::TRANSFORM: {
-			
+
 			Matrix3 basis;
 			for(int i=0;i<9;i++) {
-				
+
 				basis.elements[i/3][i%3]=value_editor[(i/3)*4+i%3]->get_text().to_double();
 			}
-			
+
 			Vector3 origin;
 			origin.x=value_editor[3]->get_text().to_double();
 			origin.y=value_editor[7]->get_text().to_double();
 			origin.z=value_editor[11]->get_text().to_double();
-			
+
 			v=Transform(basis,origin);
 			emit_signal("variant_changed");
-			
-			
+
+
 		} break;
 		case Variant::COLOR: {
 			/*
 			for (int i=0;i<4;i++) {
-				
+
 				scroll[i]->set_val( value_editor[i]->get_text().to_double() );
 			}
 			Color c;
@@ -1373,51 +1418,57 @@ void CustomPropertyEditor::_modified(String p_string) {
 			*/
 		} break;
 		case Variant::IMAGE: {
-			
-			
+
+
 		} break;
 		case Variant::NODE_PATH: {
-			
-			
-		} break;		
+
+
+		} break;
 		case Variant::INPUT_EVENT: {
-			
-			
+
+
 		} break;
 		case Variant::DICTIONARY: {
-			
-			
+
+
 		} break;
 		case Variant::RAW_ARRAY: {
-			
-			
+
+
 		} break;
 		case Variant::INT_ARRAY: {
-			
-			
+
+
 		} break;
 		case Variant::REAL_ARRAY: {
-			
-			
+
+
 		} break;
 		case Variant::STRING_ARRAY: {
-			
-			
+
+
 		} break;
 		case Variant::VECTOR3_ARRAY: {
-			
-			
+
+
 		} break;
 		case Variant::COLOR_ARRAY: {
-			
-			
+
+
 		} break;
 		default: {}
-	}		
-	
+	}
+
 	updating=false;
 }
 
+void CustomPropertyEditor::_range_modified(double p_value)
+{
+	v=p_value;
+	emit_signal("variant_changed");
+}
+
 void CustomPropertyEditor::_focus_enter() {
 	switch(type) {
 		case Variant::REAL:
@@ -1474,10 +1525,10 @@ void CustomPropertyEditor::config_action_buttons(const List<String>& p_strings)
 	set_size( Size2( w, m*2+(h+m)*p_strings.size() ) );
 
 	for (int i=0;i<MAX_ACTION_BUTTONS;i++) {
-				
+
 		if (i<p_strings.size()) {
 			action_buttons[i]->show();
-			action_buttons[i]->set_text(p_strings[i]);			
+			action_buttons[i]->set_text(p_strings[i]);
 			action_buttons[i]->set_pos( Point2( m, m+i*(h+m) ));
 			action_buttons[i]->set_size( Size2( w-m*2, h ) );
 			action_buttons[i]->set_flat(true);
@@ -1485,29 +1536,29 @@ void CustomPropertyEditor::config_action_buttons(const List<String>& p_strings)
 			action_buttons[i]->hide();
 		}
 	}
-	
-	
+
+
 }
 
 void CustomPropertyEditor::config_value_editors(int p_amount, int p_columns,int p_label_w,const List<String>& p_strings) {
-	
+
 	int w=80;
 	int h=20;
 	int m=10;
-	
+
 	int rows=((p_amount-1)/p_columns)+1;
-	
+
 	set_size( Size2( m*(1+p_columns)+(w+p_label_w)*p_columns, m*(1+rows)+h*rows ) );
-		
+
 	for (int i=0;i<MAX_VALUE_EDITORS;i++) {
-		
+
 		int c=i%p_columns;
 		int r=i/p_columns;
-		
+
 		if (i<p_amount) {
 			value_editor[i]->show();
 			value_label[i]->show();
-			value_label[i]->set_text(i<p_strings.size()?p_strings[i]:String(""));			
+			value_label[i]->set_text(i<p_strings.size()?p_strings[i]:String(""));
 			value_editor[i]->set_pos( Point2( m+p_label_w+c*(w+m+p_label_w), m+r*(h+m) ));
 			value_editor[i]->set_size( Size2( w, h ) );
 			value_label[i]->set_pos( Point2( m+c*(w+m+p_label_w), m+r*(h+m) ) );
@@ -1517,16 +1568,17 @@ void CustomPropertyEditor::config_value_editors(int p_amount, int p_columns,int
 			value_label[i]->hide();
 		}
 	}
-	
-	
-	
+
+
+
 }
 
 void CustomPropertyEditor::_bind_methods() {
-	
+
 	ObjectTypeDB::bind_method("_focus_enter", &CustomPropertyEditor::_focus_enter);
 	ObjectTypeDB::bind_method("_focus_exit", &CustomPropertyEditor::_focus_exit);
 	ObjectTypeDB::bind_method("_modified",&CustomPropertyEditor::_modified);
+	ObjectTypeDB::bind_method("_range_modified", &CustomPropertyEditor::_range_modified);
 	ObjectTypeDB::bind_method("_scroll_modified",&CustomPropertyEditor::_scroll_modified);
 	ObjectTypeDB::bind_method("_action_pressed",&CustomPropertyEditor::_action_pressed);
 	ObjectTypeDB::bind_method("_file_selected",&CustomPropertyEditor::_file_selected);
@@ -1543,13 +1595,13 @@ void CustomPropertyEditor::_bind_methods() {
 	ADD_SIGNAL( MethodInfo("resource_edit_request") );
 }
 CustomPropertyEditor::CustomPropertyEditor() {
-	
-	
+
+
 	read_only=false;
 	updating=false;
-	
+
 	for (int i=0;i<MAX_VALUE_EDITORS;i++) {
-		
+
 		value_editor[i]=memnew( LineEdit );
 		add_child( value_editor[i] );
 		value_label[i]=memnew( Label );
@@ -1560,17 +1612,17 @@ CustomPropertyEditor::CustomPropertyEditor() {
 		value_editor[i]->connect("focus_enter", this, "_focus_enter");
 		value_editor[i]->connect("focus_exit", this, "_focus_exit");
 	}
-	
+
 	for(int i=0;i<4;i++) {
-	
+
 		scroll[i] = memnew( HScrollBar );
 		scroll[i]->hide();
 		scroll[i]->set_min(0);
 		scroll[i]->set_max(1.0);
-		scroll[i]->set_step(0.01);		
+		scroll[i]->set_step(0.01);
 		add_child(scroll[i]);
 		scroll[i]->connect("value_changed", this,"_scroll_modified");
-		
+
 	}
 
 	for(int i=0;i<20;i++) {
@@ -1594,15 +1646,15 @@ CustomPropertyEditor::CustomPropertyEditor() {
 	text_edit->connect("text_changed",this,"_text_edit_changed");
 
 	for (int i=0;i<MAX_ACTION_BUTTONS;i++) {
-	
+
 		action_buttons[i]=memnew(Button);
-		action_buttons[i]->hide();	
+		action_buttons[i]->hide();
 		add_child(action_buttons[i]);
 		Vector<Variant> binds;
 		binds.push_back(i);
 		action_buttons[i]->connect("pressed", this,"_action_pressed",binds);
 	}
-	
+
 	color_picker = memnew( ColorPicker );
 	add_child(color_picker);
 	color_picker->hide();
@@ -1615,7 +1667,7 @@ CustomPropertyEditor::CustomPropertyEditor() {
 	file = memnew ( EditorFileDialog );
 	add_child(file);
 	file->hide();
-	
+
 	file->connect("file_selected", this,"_file_selected");
 	file->connect("dir_selected", this,"_file_selected");
 
@@ -1623,12 +1675,12 @@ CustomPropertyEditor::CustomPropertyEditor() {
 	error->set_title("Error!");
 	add_child(error);
 	//error->get_cancel()->hide();
-	
+
 	type_button = memnew( MenuButton );
 	add_child(type_button);
 	type_button->hide();
 	type_button->get_popup()->connect("item_pressed", this,"_type_create_selected");
-	
+
 
 	scene_tree = memnew( SceneTreeDialog );
 	add_child(scene_tree);
@@ -1650,52 +1702,182 @@ CustomPropertyEditor::CustomPropertyEditor() {
 	menu = memnew(PopupMenu);
 	add_child(menu);
 	menu->connect("item_pressed",this,"_menu_option");
-}
 
+	spinbox = memnew ( SpinBox );
+	add_child(spinbox);
+	spinbox->set_area_as_parent_rect(5);
+	spinbox->connect("value_changed",this,"_range_modified");
 
+	slider = memnew ( HSlider );
+	add_child(slider);
+	slider->set_area_as_parent_rect(5);
+	slider->connect("value_changed",this,"_range_modified");
+}
 
-Node *PropertyEditor::get_instanced_node() {
+bool PropertyEditor::_might_be_in_instance() {
 
-	//this sucks badly
 	if (!obj)
 		return NULL;
 
 	Node *node = obj->cast_to<Node>();
+
+	Node* edited_scene =EditorNode::get_singleton()->get_edited_scene();
+
+	bool might_be=false;
+
+	while(node) {
+
+		if (node->get_scene_instance_state().is_valid()) {
+			might_be=true;
+			break;
+		}
+		if (node==edited_scene) {
+			if (node->get_scene_inherited_state().is_valid()) {
+				might_be=true;
+				break;
+			}
+			might_be=false;
+			break;
+		}
+		node=node->get_owner();
+	}
+
+	return might_be;
+
+}
+
+bool PropertyEditor::_get_instanced_node_original_property(const StringName& p_prop, Variant& value) {
+
+	Node *node = obj->cast_to<Node>();
+
 	if (!node)
-		return NULL;
+		return false;
 
-	if (node->get_filename()=="")
-		return NULL;
+	Node *orig=node;
+
+	Node* edited_scene =EditorNode::get_singleton()->get_edited_scene();
+
+	bool found=false;
+
+//	print_line("for prop - "+String(p_prop));
+
+
+	while(node) {
+
+		Ref<SceneState> ss;
+
+		if (node==edited_scene) {
+			ss=node->get_scene_inherited_state();
 
-	if (!node->get_owner())
-		return NULL; //scene root i guess
+		} else {
+			ss=node->get_scene_instance_state();
+		}
+		//		print_line("at - "+String(edited_scene->get_path_to(node)));
+
+		if (ss.is_valid()) {
+
+			NodePath np = node->get_path_to(orig);
+			int node_idx = ss->find_node_by_path(np);
+			//			print_line("\t valid, nodeidx "+itos(node_idx));
+			if (node_idx>=0) {
+				bool lfound=false;
+				Variant lvar;
+				lvar=ss->get_property_value(node_idx,p_prop,lfound);
+				if (lfound) {
+
+					found=true;
+					value=lvar;
+					//					print_line("\t found value "+String(value));
+				}
+			}
+		}
+		if (node==edited_scene) {
+			//just in case
+			break;
+		}
+		node=node->get_owner();
+
+	}
 
-	return node;
+	return found;
+}
+
+bool PropertyEditor::_is_property_different(const Variant& p_current, const Variant& p_orig,int p_usage) {
+
+
+	{
+		Node *node = obj->cast_to<Node>();
+		if (!node)
+			return false;
+
+		Node* edited_scene =EditorNode::get_singleton()->get_edited_scene();
+		bool found_state=false;
+
+		//	print_line("for prop - "+String(p_prop));
+
+
+		while(node) {
+
+			Ref<SceneState> ss;
+
+			if (node==edited_scene) {
+				ss=node->get_scene_inherited_state();
+
+			} else {
+				ss=node->get_scene_instance_state();
+			}
+
+			if (ss.is_valid()) {
+				found_state=true;
+			}
+			if (node==edited_scene) {
+				//just in case
+				break;
+			}
+			node=node->get_owner();
+		}
+
+		if (!found_state)
+			return false; //pointless to check if we are not comparing against anything.
+	}
+
+	if (p_orig.get_type()==Variant::NIL) {
+
+
+
+		//special cases
+		if (p_current.is_zero() && p_usage&PROPERTY_USAGE_STORE_IF_NONZERO)
+			return false;
+		if (p_current.is_one() && p_usage&PROPERTY_USAGE_STORE_IF_NONONE)
+			return false;
+	}
+
+	return bool(Variant::evaluate(Variant::OP_NOT_EQUAL,p_current,p_orig));
 }
 
 TreeItem *PropertyEditor::find_item(TreeItem *p_item,const String& p_name) {
-	
-	
+
+
 	if (!p_item)
 		return NULL;
-	
+
 	String name = p_item->get_metadata(1);
-	
+
 	if (name==p_name) {
-		
+
 		return p_item;
 	}
-	
+
 	TreeItem *c=p_item->get_children();
-	
+
 	while (c) {
-		
+
 		TreeItem *found = find_item(c,p_name);
 		if (found)
 			return found;
 		c=c->get_next();
 	}
-	
+
 	return NULL;
 }
 
@@ -1718,9 +1900,9 @@ void PropertyEditor::_changed_callbacks(Object *p_changed,const String& p_prop)
 	if (p_prop==String())
 		update_tree_pending=true;
 	else {
-		
+
 		pending[p_prop]=p_prop;
-			
+
 	}
 }
 
@@ -1732,7 +1914,7 @@ void PropertyEditor::update_property(const String& p_prop) {
 
 
 void PropertyEditor::set_item_text(TreeItem *p_item, int p_type, const String& p_name, int p_hint, const String& p_hint_text) {
-	
+
 	switch( p_type ) {
 
 		case Variant::BOOL: {
@@ -1825,7 +2007,7 @@ void PropertyEditor::set_item_text(TreeItem *p_item, int p_type, const String& p
 
 		} break;
 		case Variant::IMAGE: {
-		
+
 			Image img = obj->get( p_name );
 			if (img.empty())
 				p_item->set_text(1,"[Image (empty)]");
@@ -1904,9 +2086,11 @@ void PropertyEditor::set_item_text(TreeItem *p_item, int p_type, const String& p
 		} break;
 		default: {};
 	}
-	
+
 }
 
+
+
 void PropertyEditor::_notification(int p_what) {
 
 	if (p_what==NOTIFICATION_ENTER_TREE) {
@@ -1919,10 +2103,10 @@ void PropertyEditor::_notification(int p_what) {
 		edit(NULL);
 	}
 
-	
+
 	if (p_what==NOTIFICATION_FIXED_PROCESS) {
-		
-		
+
+
 		if (refresh_countdown>0) {
 			refresh_countdown-=get_fixed_process_delta_time();
 			if (refresh_countdown<=0) {
@@ -1932,27 +2116,31 @@ void PropertyEditor::_notification(int p_what) {
 		}
 
 		changing=true;
-		 
+
 		if (update_tree_pending) {
 
 			update_tree();
 			update_tree_pending=false;
-			
+
 		} else {
-			
-			const String *k=NULL;	
+
+			const String *k=NULL;
 			while ((k=pending.next(k))) {
-				
+
 				TreeItem * item = find_item(tree->get_root(),*k);
 				if (!item)
 					continue;
-				
-				if (get_instanced_node()) {
 
-					Dictionary d = get_instanced_node()->get_instance_state();
-					if (d.has(*k)) {
+				if (_might_be_in_instance()) {
+
+
+					Variant vorig;
+					Dictionary d=item->get_metadata(0);
+					int usage = d.has("usage")?int(int(d["usage"])&(PROPERTY_USAGE_STORE_IF_NONONE|PROPERTY_USAGE_STORE_IF_NONZERO)):0;
+
+
+					if (_get_instanced_node_original_property(*k,vorig) || usage) {
 						Variant v = obj->get(*k);
-						Variant vorig = d[*k];
 
 						int found=-1;
 						for(int i=0;i<item->get_button_count(1);i++) {
@@ -1963,7 +2151,7 @@ void PropertyEditor::_notification(int p_what) {
 							}
 						}
 
-						bool changed = ! (v==vorig);
+						bool changed = _is_property_different(v,vorig,usage);
 
 						if ((found!=-1)!=changed) {
 
@@ -1980,15 +2168,15 @@ void PropertyEditor::_notification(int p_what) {
 					}
 
 				}
-				Dictionary d=item->get_metadata(0);	
+				Dictionary d=item->get_metadata(0);
 				set_item_text(item,d["type"],d["name"],d["hint"],d["hint_text"]);
-			}				
+			}
 		}
-			
+
 		pending.clear();
-			
+
 		changing=false;
-			
+
 	}
 }
 
@@ -2046,12 +2234,14 @@ void PropertyEditor::_refresh_item(TreeItem *p_item) {
 
 	if (name!=String()) {
 
-		if (get_instanced_node()) {
+		if (_might_be_in_instance()) {
 
-			Dictionary d = get_instanced_node()->get_instance_state();
-			if (d.has(name)) {
+			Variant vorig;
+			Dictionary d=p_item->get_metadata(0);
+			int usage = d.has("usage")?int(int(d["usage"])&(PROPERTY_USAGE_STORE_IF_NONONE|PROPERTY_USAGE_STORE_IF_NONZERO)):0;
+
+			if (_get_instanced_node_original_property(name,vorig) || usage) {
 				Variant v = obj->get(name);
-				Variant vorig = d[name];
 
 				int found=-1;
 				for(int i=0;i<p_item->get_button_count(1);i++) {
@@ -2062,7 +2252,7 @@ void PropertyEditor::_refresh_item(TreeItem *p_item) {
 					}
 				}
 
-				bool changed = ! (v==vorig);
+				bool changed = _is_property_different(v,vorig,usage);
 
 				if ((found!=-1)!=changed) {
 
@@ -2212,6 +2402,23 @@ void PropertyEditor::update_tree() {
 			sep->set_selectable(1,false);
 			sep->set_custom_bg_color(0,get_color("prop_category","Editor"));
 			sep->set_custom_bg_color(1,get_color("prop_category","Editor"));
+
+			if (use_doc_hints) {
+				StringName type=p.name;
+				if (!class_descr_cache.has(type)) {
+
+					String descr;
+					DocData *dd=EditorHelp::get_doc_data();
+					Map<String,DocData::ClassDoc>::Element *E=dd->class_list.find(type);
+					if (E) {
+						descr=E->get().brief_description;
+					}
+					class_descr_cache[type]=descr.world_wrap(80);
+
+				}
+
+				sep->set_tooltip(0,"Class: "+p.name+":\n\n"+class_descr_cache[type]);
+			}
 			//sep->set_custom_color(0,Color(1,1,1));
 
 
@@ -2265,25 +2472,62 @@ void PropertyEditor::update_tree() {
 
 		item->set_tooltip(0, p.name);
 
+		if (use_doc_hints) {
+			StringName setter;
+			StringName type;
+			if (ObjectTypeDB::get_setter_and_type_for_property(obj->get_type_name(),p.name,type,setter)) {
+
+				String descr;
+				bool found=false;
+				Map<StringName,Map<StringName,String> >::Element *E=descr_cache.find(type);
+				if (E) {
+
+					Map<StringName,String>::Element *F=E->get().find(setter);
+					if (F) {
+						found=true;
+						descr=F->get();
+					}
+				}
+				if (!found) {
+
+					DocData *dd=EditorHelp::get_doc_data();
+					Map<String,DocData::ClassDoc>::Element *E=dd->class_list.find(type);
+					if (E) {
+						for(int i=0;i<E->get().methods.size();i++) {
+							if (E->get().methods[i].name==setter.operator String()) {
+								descr=E->get().methods[i].description.strip_edges().world_wrap(80);
+							}
+						}
+					}
+
+					descr_cache[type][setter]=descr;
+				}
+
+				item->set_tooltip(0, "Property: "+p.name+"\n\n"+descr);
+			}
+		}
+		//EditorHelp::get_doc_data();
+
 		Dictionary d;
 		d["name"]=p.name;
 		d["type"]=(int)p.type;
 		d["hint"]=(int)p.hint;
 		d["hint_text"]=p.hint_string;
-					
+		d["usage"]=(int)p.usage;
+
 		item->set_metadata( 0, d );
 		item->set_metadata( 1, p.name );
 
 		if (draw_red)
 			item->set_custom_color(0,Color(0.8,0.4,0.20));
 
-		
+
 		if (p.name==selected_property) {
 
 			item->select(1);
 		}
 
-		
+
 		//printf("property %s type %i\n",p.name.ascii().get_data(),p.type);
 		switch( p.type ) {
 
@@ -2347,8 +2591,10 @@ void PropertyEditor::update_tree() {
 
 
 				item->set_cell_mode( 1, TreeItem::CELL_MODE_RANGE );
+				if (p.hint==PROPERTY_HINT_SPRITE_FRAME) {
+					item->set_range_config(1,0,99999,1);
 
-				if (p.hint==PROPERTY_HINT_RANGE || p.hint==PROPERTY_HINT_EXP_RANGE) {
+				} else if (p.hint==PROPERTY_HINT_RANGE || p.hint==PROPERTY_HINT_EXP_RANGE) {
 
 					int c = p.hint_string.get_slice_count(",");
 					float min=0,max=100,step=1;
@@ -2364,8 +2610,8 @@ void PropertyEditor::update_tree() {
 					if (p.type==Variant::REAL && c>=3) {
 
 						step= p.hint_string.get_slice(",",2).to_double();
-					} 
-					
+					}
+
 
 					item->set_range_config(1,min,max,step,p.hint==PROPERTY_HINT_EXP_RANGE);
 				} else if (p.hint==PROPERTY_HINT_ENUM) {
@@ -2449,11 +2695,32 @@ void PropertyEditor::update_tree() {
 				}
 
 			} break;
+			case Variant::ARRAY: {
+
+				item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM );
+				item->add_button(1,get_icon("EditResource","EditorIcons"));
+
+
+				Variant v = obj->get(p.name);
+				if (v.is_array())
+					item->set_text(1,"Array["+itos(v.call("size"))+"]");
+				else
+					item->set_text(1,"Array[]");
+				item->set_icon( 0, get_icon("ArrayData","EditorIcons") );
+
+
+			} break;
+
 			case Variant::INT_ARRAY: {
 
 				item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM );
-				item->set_editable( 1, !read_only );
-				item->set_text(1,"[IntArray]");
+				item->add_button(1,get_icon("EditResource","EditorIcons"));
+
+				Variant v = obj->get(p.name);
+				if (v.is_array())
+					item->set_text(1,"IntArray["+itos(v.call("size"))+"]");
+				else
+					item->set_text(1,"IntArray[]");
 				item->set_icon( 0, get_icon("ArrayInt","EditorIcons") );
 
 
@@ -2461,26 +2728,86 @@ void PropertyEditor::update_tree() {
 			case Variant::REAL_ARRAY: {
 
 				item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM );
-				item->set_editable( 1, !read_only );
-				item->set_text(1,"[RealArray]");
+				item->add_button(1,get_icon("EditResource","EditorIcons"));
+
+				Variant v = obj->get(p.name);
+				if (v.is_array())
+					item->set_text(1,"FloatArray["+itos(v.call("size"))+"]");
+				else
+					item->set_text(1,"FloatArray[]");
 				item->set_icon( 0, get_icon("ArrayReal","EditorIcons") );
 
+
 			} break;
 			case Variant::STRING_ARRAY: {
 
 				item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM );
-				item->set_editable( 1, !read_only );
-				item->set_text(1,"[StringArray]");
+				item->add_button(1,get_icon("EditResource","EditorIcons"));
+
+				Variant v = obj->get(p.name);
+				if (v.is_array())
+					item->set_text(1,"String["+itos(v.call("size"))+"]");
+				else
+					item->set_text(1,"String[]");
 				item->set_icon( 0, get_icon("ArrayString","EditorIcons") );
 
+
 			} break;
 			case Variant::RAW_ARRAY: {
 
 				item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM );
-				item->set_editable( 1, !read_only );
-				item->set_text(1,"[Raw Data]");
+				item->add_button(1,get_icon("EditResource","EditorIcons"));
+
+				Variant v = obj->get(p.name);
+				if (v.is_array())
+					item->set_text(1,"Byte["+itos(v.call("size"))+"]");
+				else
+					item->set_text(1,"Byte[]");
 				item->set_icon( 0, get_icon("ArrayData","EditorIcons") );
 
+
+			} break;
+			case Variant::VECTOR2_ARRAY: {
+
+				item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM );
+				item->add_button(1,get_icon("EditResource","EditorIcons"));
+
+				Variant v = obj->get(p.name);
+				if (v.is_array())
+					item->set_text(1,"Vector2["+itos(v.call("size"))+"]");
+				else
+					item->set_text(1,"Vector2[]");
+				item->set_icon( 0, get_icon("Vector2","EditorIcons") );
+
+
+			} break;
+			case Variant::VECTOR3_ARRAY: {
+
+				item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM );
+				item->add_button(1,get_icon("EditResource","EditorIcons"));
+
+				Variant v = obj->get(p.name);
+				if (v.is_array())
+					item->set_text(1,"Vector3["+itos(v.call("size"))+"]");
+				else
+					item->set_text(1,"Vector3[]");
+				item->set_icon( 0, get_icon("Vector","EditorIcons") );
+
+
+			} break;
+			case Variant::COLOR_ARRAY: {
+
+				item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM );
+				item->add_button(1,get_icon("EditResource","EditorIcons"));
+
+				Variant v = obj->get(p.name);
+				if (v.is_array())
+					item->set_text(1,"Color["+itos(v.call("size"))+"]");
+				else
+					item->set_text(1,"Color[]");
+				item->set_icon( 0, get_icon("Color","EditorIcons") );
+
+
 			} break;
 			case Variant::VECTOR2: {
 
@@ -2548,7 +2875,7 @@ void PropertyEditor::update_tree() {
 
 			} break;
 			case Variant::IMAGE: {
-			
+
 				item->set_cell_mode( 1, TreeItem::CELL_MODE_CUSTOM );
 				item->set_editable( 1, !read_only );
 				Image img = obj->get( p.name );
@@ -2557,7 +2884,7 @@ void PropertyEditor::update_tree() {
 				else
 					item->set_text(1,"[Image "+itos(img.get_width())+"x"+itos(img.get_height())+"]");
 				item->set_icon( 0,get_icon("Image","EditorIcons") );
-			
+
 			} break;
 			case Variant::NODE_PATH: {
 
@@ -2638,14 +2965,17 @@ void PropertyEditor::update_tree() {
 			}
 		}
 
-		if (get_instanced_node()) {
+		if (_might_be_in_instance()) {
 
-			Dictionary d = get_instanced_node()->get_instance_state();
-			if (d.has(p.name)) {
+			Variant vorig;
+			Dictionary d=item->get_metadata(0);
+			int usage = d.has("usage")?int(int(d["usage"])&(PROPERTY_USAGE_STORE_IF_NONONE|PROPERTY_USAGE_STORE_IF_NONZERO)):0;
+			if (_get_instanced_node_original_property(p.name,vorig) || usage) {
 				Variant v = obj->get(p.name);
-				Variant vorig = d[p.name];
-				if (! (v==vorig)) {
+				
 
+				if (_is_property_different(v,vorig,usage)) {
+					//print_line("FOR "+String(p.name)+" RELOAD WITH: "+String(v)+"("+Variant::get_type_name(v.get_type())+")=="+String(vorig)+"("+Variant::get_type_name(vorig.get_type())+")");
 					item->add_button(1,get_icon("Reload","EditorIcons"),3);
 				}
 			}
@@ -2676,7 +3006,7 @@ void PropertyEditor::_edit_set(const String& p_name, const Variant& p_value) {
 		}
 	}
 
-	if (!undo_redo) {
+	if (!undo_redo || obj->cast_to<MultiNodeEdit>() || obj->cast_to<ArrayPropertyEdit>()) { //kind of hacky
 
 		obj->set(p_name,p_value);
 		_changed_callbacks(obj,p_name);
@@ -2708,10 +3038,10 @@ void PropertyEditor::_edit_set(const String& p_name, const Variant& p_value) {
 
 void PropertyEditor::_item_edited() {
 
-	
-	TreeItem * item = tree->get_edited();		
+
+	TreeItem * item = tree->get_edited();
 	Dictionary d = item->get_metadata(0);
-	
+
 	String name=d["name"];
 
 	if (tree->get_edited_column()==0) {
@@ -2740,12 +3070,12 @@ void PropertyEditor::_item_edited() {
 	int hint= d["hint"];
 	String hint_text=d["hint_text"];
 	switch(type) {
-		
+
 		case Variant::NIL: {
-			
-		} break;			
+
+		} break;
 		case Variant::BOOL: {
-			
+
 			_edit_set(name,item->is_checked(1));
 		} break;
 		case Variant::INT:
@@ -2764,7 +3094,7 @@ void PropertyEditor::_item_edited() {
 				_edit_set(name,item->get_range(1));
 		} break;
 		case Variant::STRING: {
-			
+
 			if (hint==PROPERTY_HINT_ENUM) {
 
 				int idx= item->get_range(1);
@@ -2782,64 +3112,64 @@ void PropertyEditor::_item_edited() {
 			}
 		} break;
 			// math types
-			
+
 		case Variant::VECTOR3: {
-			
+
 		} break;
 		case Variant::PLANE: {
-			
+
 		} break;
 		case Variant::QUAT: {
-			
+
 		} break;
 		case Variant::_AABB: {
-			
+
 		} break;
 		case Variant::MATRIX3: {
-			
+
 		} break;
 		case Variant::TRANSFORM: {
-			
+
 		} break;
-			
+
 		case Variant::COLOR: {
 			//_edit_set(name,item->get_custom_bg_color(0));
 		} break;
 		case Variant::IMAGE: {
-			
+
 		} break;
 		case Variant::NODE_PATH: {
-			
+
 		} break;
 
 		case Variant::INPUT_EVENT: {
-			
+
 		} break;
 		case Variant::DICTIONARY: {
-			
+
 		} break;
-			
+
 			// arrays
 		case Variant::RAW_ARRAY: {
-			
+
 		} break;
 		case Variant::INT_ARRAY: {
-			
+
 		} break;
 		case Variant::REAL_ARRAY: {
-			
+
 		} break;
 		case Variant::STRING_ARRAY: {
-			
+
 		} break;
 		case Variant::VECTOR3_ARRAY: {
-			
+
 		} break;
 		case Variant::COLOR_ARRAY: {
-			
+
 		} break;
-			
-		
+
+
 	};
 }
 
@@ -2890,24 +3220,24 @@ void PropertyEditor::_custom_editor_request(bool p_arrow) {
 }
 
 void PropertyEditor::edit(Object* p_object) {
-	
+
 
 	if (obj==p_object)
 		return;
 	if (obj) {
-		
+
 		obj->remove_change_receptor(this);
 	}
 
 	obj=p_object;
 	update_tree();
-	
+
 	if (obj) {
-		
+
 		obj->add_change_receptor(this);
 	}
-	
-	
+
+
 }
 
 void PropertyEditor::_set_range_def(Object *p_item, String prop,float p_frame) {
@@ -2942,17 +3272,18 @@ void PropertyEditor::_edit_button(Object *p_item, int p_column, int p_button) {
 		call_deferred("_set_range_def",ti,prop,ti->get_range(p_column)+1.0);
 	} else if (p_button==3) {
 
-		if (!get_instanced_node())
+		if (!_might_be_in_instance())
 			return;
 		if (!d.has("name"))
 			return;
 
 		String prop=d["name"];
 
-		Dictionary d2 = get_instanced_node()->get_instance_state();
-		if (d2.has(prop)) {
+		Variant vorig;
+
+		if (_get_instanced_node_original_property(prop,vorig)) {
 
-			_edit_set(prop,d2[prop]);
+			_edit_set(prop,vorig);
 		}
 
 	} else {
@@ -2996,15 +3327,28 @@ void PropertyEditor::_edit_button(Object *p_item, int p_column, int p_button) {
 
 				emit_signal("resource_selected",r,n);
 			}
+		} else if (t==Variant::ARRAY || t==Variant::INT_ARRAY || t==Variant::REAL_ARRAY || t==Variant::STRING_ARRAY || t==Variant::VECTOR2_ARRAY || t==Variant::VECTOR3_ARRAY || t==Variant::COLOR_ARRAY || t==Variant::RAW_ARRAY) {
+
+			Variant v = obj->get(n);
+
+			if (v.get_type()!=t) {
+				Variant::CallError ce;
+				v=Variant::construct(Variant::Type(t),NULL,0,ce);
+			}
+
+			Ref<ArrayPropertyEdit> ape = memnew( ArrayPropertyEdit );
+			ape->edit(obj,n,Variant::Type(t));
+
+			EditorNode::get_singleton()->push_item(ape.ptr());
 		}
 	}
 }
 
 
 void PropertyEditor::_node_removed(Node *p_node) {
-	
+
 	if (p_node==obj) {
-		
+
 		edit(NULL);
 	}
 }
@@ -3064,9 +3408,9 @@ void PropertyEditor::_bind_methods() {
 	ObjectTypeDB::bind_method( "_item_edited",&PropertyEditor::_item_edited);
 	ObjectTypeDB::bind_method( "_item_selected",&PropertyEditor::_item_selected);
 	ObjectTypeDB::bind_method( "_custom_editor_request",&PropertyEditor::_custom_editor_request);
-	ObjectTypeDB::bind_method( "_custom_editor_edited",&PropertyEditor::_custom_editor_edited);	
-	ObjectTypeDB::bind_method( "_resource_edit_request",&PropertyEditor::_resource_edit_request);	
-	ObjectTypeDB::bind_method( "_node_removed",&PropertyEditor::_node_removed);		
+	ObjectTypeDB::bind_method( "_custom_editor_edited",&PropertyEditor::_custom_editor_edited);
+	ObjectTypeDB::bind_method( "_resource_edit_request",&PropertyEditor::_resource_edit_request);
+	ObjectTypeDB::bind_method( "_node_removed",&PropertyEditor::_node_removed);
 	ObjectTypeDB::bind_method( "_edit_button",&PropertyEditor::_edit_button);
 	ObjectTypeDB::bind_method( "_changed_callback",&PropertyEditor::_changed_callbacks);
 	ObjectTypeDB::bind_method( "_draw_flags",&PropertyEditor::_draw_flags);
@@ -3126,29 +3470,29 @@ void PropertyEditor::set_show_categories(bool p_show) {
 }
 
 PropertyEditor::PropertyEditor() {
-	
+
 	_prop_edited="property_edited";
 	_prop_edited_name.push_back(String());
 	undo_redo=NULL;
 	obj=NULL;
 	changing=false;
 	update_tree_pending=false;
-	
+
 	top_label = memnew( Label );
 	top_label->set_text("Properties:");
 	top_label->set_anchor( MARGIN_RIGHT, ANCHOR_END );
 	top_label->set_begin( Point2( 10,0) );
-	top_label->set_end( Point2( 0,12) );		
-	
-	add_child(top_label);	
+	top_label->set_end( Point2( 0,12) );
+
+	add_child(top_label);
+
 
-	
 	tree = memnew( Tree );
 	tree->set_anchor( MARGIN_RIGHT, ANCHOR_END );
-	tree->set_anchor( MARGIN_BOTTOM, ANCHOR_END );	
+	tree->set_anchor( MARGIN_BOTTOM, ANCHOR_END );
 	tree->set_begin( Point2(0,19 ));
 	tree->set_end( Point2(0,0 ));
-	
+
 	tree->set_columns(2);
 	tree->set_column_expand(0,true);
 	tree->set_column_min_width(0,30);
@@ -3156,21 +3500,21 @@ PropertyEditor::PropertyEditor() {
 	tree->set_column_min_width(1,18);
 
 	//tree->set_hide_root(true);
-	add_child( tree );	
-	
+	add_child( tree );
+
 	tree->connect("item_edited", this,"_item_edited",varray(),CONNECT_DEFERRED);
 	tree->connect("cell_selected", this,"_item_selected");
-	
+
 	set_fixed_process(true);
-	
+
 	custom_editor = memnew( CustomPropertyEditor );
 	add_child(custom_editor);
-	
+
 	tree->connect("custom_popup_edited", this,"_custom_editor_request");
 	tree->connect("button_pressed", this,"_edit_button");
 	custom_editor->connect("variant_changed", this,"_custom_editor_edited");
 	custom_editor->connect("resource_edit_request", this,"_resource_edit_request",make_binds(),CONNECT_DEFERRED);
-	
+
 	capitalize_paths=true;
 	autoclear=false;
 	tree->set_column_title(0,"Property");
@@ -3181,6 +3525,7 @@ PropertyEditor::PropertyEditor() {
 	read_only=false;
 	show_categories=false;
 	refresh_countdown=0;
+	use_doc_hints=false;
 	
 }
 
diff --git a/tools/editor/property_editor.h b/tools/editor/property_editor.h
index de5cac8711..dcb7b66abd 100644
--- a/tools/editor/property_editor.h
+++ b/tools/editor/property_editor.h
@@ -46,9 +46,9 @@
 */
 
 class CustomPropertyEditor : public Popup {
-	
+
 	OBJ_TYPE( CustomPropertyEditor, Popup );
-	
+
 	enum {
 		MAX_VALUE_EDITORS=12,
 		MAX_ACTION_BUTTONS=5,
@@ -93,6 +93,8 @@ class CustomPropertyEditor : public Popup {
 	TextEdit *text_edit;
 	bool read_only;
 	Button *checks20[20];
+	SpinBox *spinbox;
+	HSlider *slider;
 
 
 	Control *easing_draw;
@@ -105,6 +107,7 @@ class CustomPropertyEditor : public Popup {
 	void _file_selected(String p_file);
 	void _scroll_modified(double p_value);
 	void _modified(String p_string);
+	void _range_modified(double p_value);
 	void _focus_enter();
 	void _focus_exit();
 	void _action_pressed(int p_which);
@@ -113,33 +116,34 @@ class CustomPropertyEditor : public Popup {
 	void _color_changed(const Color& p_color);
 	void _draw_easing();
 	void _menu_option(int p_which);
-	
+
 	void _drag_easing(const InputEvent& p_ev);
 
 	void _node_path_selected(NodePath p_path);
 	void show_value_editors(int p_amount);
 	void config_value_editors(int p_amount, int p_columns,int p_label_w,const List<String>& p_strings);
 	void config_action_buttons(const List<String>& p_strings);
+
 protected:
 
 	void _notification(int p_what);
-	static void _bind_methods();			
-	
-public:	
+	static void _bind_methods();
+
+public:
 	Variant get_variant() const;
 	String get_name() const;
-	
+
 	void set_read_only(bool p_read_only) { read_only=p_read_only; }
 
 	bool edit(Object* p_owner,const String& p_name,Variant::Type p_type, const Variant& p_variant,int p_hint,String p_hint_text);
-	
+
 	CustomPropertyEditor();
 };
 
 class PropertyEditor : public Control {
-	
+
 	OBJ_TYPE( PropertyEditor, Control );
-	
+
 	Tree *tree;
 	Label *top_label;
 	//Object *object;
@@ -157,41 +161,49 @@ class PropertyEditor : public Control {
 	bool read_only;
 	bool show_categories;
 	float refresh_countdown;
+	bool use_doc_hints;
 
 	HashMap<String,String> pending;
 	String selected_property;
+
+	Map<StringName,Map<StringName,String> > descr_cache;
+	Map<StringName,String > class_descr_cache;
 	
 	CustomPropertyEditor *custom_editor;
-	
+
 	void _resource_edit_request();
 	void _custom_editor_edited();
 	void _custom_editor_request(bool p_arrow);
-	
+
 	void _item_selected();
 	void _item_edited();
 	TreeItem *get_parent_node(String p_path,HashMap<String,TreeItem*>& item_paths,TreeItem *root);
-	
+
 	void set_item_text(TreeItem *p_item, int p_type, const String& p_name, int p_hint=PROPERTY_HINT_NONE, const String& p_hint_text="");
-		
+
 	TreeItem *find_item(TreeItem *p_item,const String& p_name);
-		
-	
+
+
 	virtual void _changed_callback(Object *p_changed,const char * p_what);
 	virtual void _changed_callbacks(Object *p_changed,const String& p_callback);
 
+
 	void _edit_button(Object *p_item, int p_column, int p_button);
-	
+
 	void _node_removed(Node *p_node);
 	void _edit_set(const String& p_name, const Variant& p_value);
 	void _draw_flags(Object *ti,const Rect2& p_rect);
 
-	Node *get_instanced_node();
+	bool _might_be_in_instance();
+	bool _get_instanced_node_original_property(const StringName& p_prop,Variant& value);
+	bool _is_property_different(const Variant& p_current, const Variant& p_orig,int p_usage=0);
+
 	void _refresh_item(TreeItem *p_item);
 	void _set_range_def(Object *p_item, String prop, float p_frame);
 
 	UndoRedo *undo_redo;
 protected:
-	
+
 	void _notification(int p_what);
 	static void _bind_methods();
 public:
@@ -217,6 +229,7 @@ public:
 	void set_autoclear(bool p_enable);
 
 	void set_show_categories(bool p_show);
+	void set_use_doc_hints(bool p_enable) { use_doc_hints=p_enable; }
 	
 	PropertyEditor();	
 	~PropertyEditor();
diff --git a/tools/editor/quick_open.cpp b/tools/editor/quick_open.cpp
index 749318386c..6135a4ab64 100644
--- a/tools/editor/quick_open.cpp
+++ b/tools/editor/quick_open.cpp
@@ -30,8 +30,9 @@
 #include "os/keyboard.h"
 
 
-void EditorQuickOpen::popup(const String& p_base, bool p_dontclear) {
+void EditorQuickOpen::popup(const StringName &p_base, bool p_dontclear, bool p_add_dirs) {
 
+	add_directories=p_add_dirs;
 	popup_centered_ratio(0.6);
 	if (p_dontclear)
 		search_box->select_all();
@@ -66,27 +67,53 @@ void EditorQuickOpen::_sbox_input(const InputEvent& p_ie) {
 
 void EditorQuickOpen::_parse_fs(EditorFileSystemDirectory *efsd) {
 
-	for(int i=0;i<efsd->get_subdir_count();i++) {
+	if (!add_directories) {
+		for(int i=0;i<efsd->get_subdir_count();i++) {
 
-		_parse_fs(efsd->get_subdir(i));
+			_parse_fs(efsd->get_subdir(i));
+		}
 	}
 
+	TreeItem *root = search_options->get_root();
+
+	if (add_directories) {
+		String path = efsd->get_path();
+		if (!path.ends_with("/"))
+			path+="/";
+		if (path!="res://") {
+			path=path.substr(6,path.length());
+			if (path.findn(search_box->get_text())!=-1) {
+				TreeItem *ti = search_options->create_item(root);
+				ti->set_text(0,path);
+				Ref<Texture> icon = get_icon("folder","FileDialog");
+				ti->set_icon(0,icon);
+			}
+		}
+	}
 	for(int i=0;i<efsd->get_file_count();i++) {
 
 		String file = efsd->get_file_path(i);
 		file=file.substr(6,file.length());
 		if (ObjectTypeDB::is_type(efsd->get_file_type(i),base_type) && (search_box->get_text()=="" || file.findn(search_box->get_text())!=-1)) {
 
-			TreeItem *root = search_options->get_root();
 			TreeItem *ti = search_options->create_item(root);
 			ti->set_text(0,file);
-			Ref<Texture> icon = get_icon( (has_icon(efsd->get_file_type(i),"EditorIcons")?efsd->get_file_type(i):String("Object")),"EditorIcons");
+			Ref<Texture> icon = get_icon( (has_icon(efsd->get_file_type(i),ei)?efsd->get_file_type(i):ot),ei);
 			ti->set_icon(0,icon);
 			if (root->get_children()==ti)
 				ti->select(0);
 
 		}
 	}
+
+
+	if (add_directories) {
+		for(int i=0;i<efsd->get_subdir_count();i++) {
+
+			_parse_fs(efsd->get_subdir(i));
+		}
+	}
+
 }
 
 void EditorQuickOpen::_update_search() {
@@ -118,7 +145,7 @@ void EditorQuickOpen::_notification(int p_what) {
 }
 
 
-String EditorQuickOpen::get_base_type() const {
+StringName EditorQuickOpen::get_base_type() const {
 
 	return base_type;
 }
@@ -152,4 +179,7 @@ EditorQuickOpen::EditorQuickOpen() {
 	set_hide_on_ok(false);
 	search_options->connect("item_activated",this,"_confirmed");
 	search_options->set_hide_root(true);
+	ei="EditorIcons";
+	ot="Object";
+	add_directories=false;
 }
diff --git a/tools/editor/quick_open.h b/tools/editor/quick_open.h
index 63652a442a..8b38256d39 100644
--- a/tools/editor/quick_open.h
+++ b/tools/editor/quick_open.h
@@ -38,7 +38,11 @@ class EditorQuickOpen : public ConfirmationDialog {
 
 	LineEdit *search_box;
 	Tree *search_options;
-	String base_type;
+	StringName base_type;
+	StringName ei;
+	StringName ot;
+	bool add_directories;
+
 
 	void _update_search();
 
@@ -55,9 +59,9 @@ protected:
 	static void _bind_methods();
 public:
 
-	String get_base_type() const;
+	StringName get_base_type() const;
 
-	void popup(const String& p_base,bool p_dontclear=false);
+	void popup(const StringName& p_base,bool p_dontclear=false,bool p_add_dirs=false);
 	EditorQuickOpen();
 };
 
diff --git a/tools/editor/reparent_dialog.cpp b/tools/editor/reparent_dialog.cpp
index 6d0c5b867e..78ba47d54b 100644
--- a/tools/editor/reparent_dialog.cpp
+++ b/tools/editor/reparent_dialog.cpp
@@ -103,6 +103,7 @@ ReparentDialog::ReparentDialog() {
 	add_child(node_only);
 	node_only->hide();
 
+	tree->set_show_enabled_subscene(true);
 	//vbc->add_margin_child("Options:",node_only);;
 	
 
diff --git a/tools/editor/scene_tree_dock.cpp b/tools/editor/scene_tree_dock.cpp
index 49cbebdb43..08aa68d792 100644
--- a/tools/editor/scene_tree_dock.cpp
+++ b/tools/editor/scene_tree_dock.cpp
@@ -33,11 +33,12 @@
 #include "scene/resources/packed_scene.h"
 #include "editor_settings.h"
 #include "tools/editor/plugins/canvas_item_editor_plugin.h"
-
+#include "script_editor_debugger.h"
+#include "tools/editor/plugins/script_editor_plugin.h"
+#include "multi_node_edit.h"
 
 void SceneTreeDock::_unhandled_key_input(InputEvent p_event) {
 
-
 	uint32_t sc = p_event.key.get_scancode_with_modifiers();
 	if (!p_event.key.pressed || p_event.key.echo)
 		return;
@@ -70,7 +71,7 @@ Node* SceneTreeDock::instance(const String& p_file) {
 	Node*instanced_scene=NULL;
 	Ref<PackedScene> sdata = ResourceLoader::load(p_file);
 	if (sdata.is_valid())
-		instanced_scene=sdata->instance();
+		instanced_scene=sdata->instance(true);
 
 
 	if (!instanced_scene) {
@@ -95,7 +96,7 @@ Node* SceneTreeDock::instance(const String& p_file) {
 		}
 	}
 
-	instanced_scene->generate_instance_state();
+	//instanced_scene->generate_instance_state();
 	instanced_scene->set_filename( Globals::get_singleton()->localize_path(p_file) );
 
 	editor_data->get_undo_redo().create_action("Instance Scene");
@@ -105,6 +106,13 @@ Node* SceneTreeDock::instance(const String& p_file) {
 	editor_data->get_undo_redo().add_do_method(editor_selection,"add_node",instanced_scene);
 	editor_data->get_undo_redo().add_do_reference(instanced_scene);
 	editor_data->get_undo_redo().add_undo_method(parent,"remove_child",instanced_scene);
+
+
+	String new_name = parent->validate_child_name(instanced_scene->get_name());
+	ScriptEditorDebugger *sed = ScriptEditor::get_singleton()->get_debugger();
+	editor_data->get_undo_redo().add_do_method(sed,"live_debug_instance_node",edited_scene->get_path_to(parent),p_file,new_name);
+	editor_data->get_undo_redo().add_undo_method(sed,"live_debug_remove_node",NodePath(String(edited_scene->get_path_to(parent))+"/"+new_name));
+
 	editor_data->get_undo_redo().commit_action();
 
 
@@ -150,8 +158,8 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 		case TOOL_NEW: {
 
 
-			if (!_validate_no_foreign())
-				break;
+			//if (!_validate_no_foreign())
+			//	break;
 			create_dialog->popup_centered_ratio();
 		} break;
 		case TOOL_INSTANCE: {
@@ -168,8 +176,8 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 				break;
 			}
 
-			if (!_validate_no_foreign())
-				break;
+			//if (!_validate_no_foreign())
+			//	break;
 
 			file->set_mode(EditorFileDialog::MODE_OPEN_FILE);
 			List<String> extensions;
@@ -194,8 +202,8 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 			if (!current)
 				break;
 
-			if (!_validate_no_foreign())
-				break;
+			//if (!_validate_no_foreign())
+			//	break;
 			connect_dialog->popup_centered_ratio();
 			connect_dialog->set_node(current);
 
@@ -205,8 +213,8 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 			Node *current = scene_tree->get_selected();
 			if (!current)
 				break;
-			if (!_validate_no_foreign())
-				break;
+			//if (!_validate_no_foreign())
+			//	break;
 			groups_editor->set_current(current);
 			groups_editor->popup_centered_ratio();
 		} break;
@@ -216,8 +224,8 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 			if (!selected)
 				break;
 
-			if (!_validate_no_foreign())
-				break;
+			//if (!_validate_no_foreign())
+			//	break;
 
 			Ref<Script> existing = selected->get_script();
 			if (existing.is_valid())
@@ -389,9 +397,14 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 					editor_data->get_undo_redo().add_do_method(d,"set_owner",node->get_owner());
 				}
 				editor_data->get_undo_redo().add_do_method(editor_selection,"add_node",dup);
-				editor_data->get_undo_redo().add_undo_method(parent,"remove_child",dup);
+				editor_data->get_undo_redo().add_undo_method(parent,"remove_child",dup);								
 				editor_data->get_undo_redo().add_do_reference(dup);
 
+				ScriptEditorDebugger *sed = ScriptEditor::get_singleton()->get_debugger();
+
+				editor_data->get_undo_redo().add_do_method(sed,"live_debug_duplicate_node",edited_scene->get_path_to(node),attempt);
+				editor_data->get_undo_redo().add_undo_method(sed,"live_debug_remove_node",NodePath(String(edited_scene->get_path_to(parent))+"/"+attempt));
+
 				//parent->add_child(dup);
 				//reselect.push_back(dup);
 			}
@@ -437,6 +450,19 @@ void SceneTreeDock::_tool_selected(int p_tool, bool p_confirm_override) {
 			reparent_dialog->set_current( nodeset );
 
 		} break;
+		case TOOL_MULTI_EDIT: {
+
+			Node*root=EditorNode::get_singleton()->get_edited_scene();
+			if (!root)
+				break;
+			Ref<MultiNodeEdit> mne = memnew( MultiNodeEdit );
+			for (const Map<Node*,Object*>::Element *E=EditorNode::get_singleton()->get_editor_selection()->get_selection().front();E;E=E->next()) {
+				mne->add_node(root->get_path_to(E->key()));
+			}
+
+			EditorNode::get_singleton()->push_item(mne.ptr());
+
+		} break;
 		case TOOL_ERASE: {
 
 			List<Node*> remove_list = editor_selection->get_selected_node_list();
@@ -494,6 +520,7 @@ void SceneTreeDock::_notification(int p_what) {
 				"MoveDown",
 				"Duplicate",
 				"Reparent",
+				"MultiNodeEdit",
 				"Remove",
 			};
 
@@ -502,6 +529,8 @@ void SceneTreeDock::_notification(int p_what) {
 			for(int i=0;i<TOOL_BUTTON_MAX;i++)
 				tool_buttons[i]->set_icon(get_icon(button_names[i],"EditorIcons"));
 
+			EditorNode::get_singleton()->get_editor_selection()->connect("selection_changed",this,"_selection_changed");
+
 		} break;
 	}
 }
@@ -544,9 +573,9 @@ Node *SceneTreeDock::_duplicate(Node *p_node, Map<Node*,Node*> &duplimap) {
 
 		Ref<PackedScene> sd = ResourceLoader::load( p_node->get_filename() );
 		ERR_FAIL_COND_V(!sd.is_valid(),NULL);
-		node = sd->instance();
+		node = sd->instance(true);
 		ERR_FAIL_COND_V(!node,NULL);
-		node->generate_instance_state();
+		//node->generate_instance_state();
 	} else {
 		Object *obj = ObjectTypeDB::instance(p_node->get_type());
 		ERR_FAIL_COND_V(!obj,NULL);
@@ -845,6 +874,16 @@ bool SceneTreeDock::_validate_no_foreign() {
 			return false;
 
 		}
+
+        if (edited_scene->get_scene_inherited_state().is_valid() && edited_scene->get_scene_inherited_state()->find_node_by_path(edited_scene->get_path_to(E->get()))>=0) {
+
+			accept->get_ok()->set_text("Makes Sense!");
+			accept->set_text("Can't operate on nodes the current scene inherits from!");
+			accept->popup_centered_minsize();
+			return false;
+
+		}
+
 	}
 
 	return true;
@@ -903,6 +942,13 @@ void SceneTreeDock::_node_reparent(NodePath p_path,bool p_node_only) {
 
 		editor_data->get_undo_redo().add_do_method(node->get_parent(),"remove_child",node);
 		editor_data->get_undo_redo().add_do_method(new_parent,"add_child",node);
+
+		ScriptEditorDebugger *sed = ScriptEditor::get_singleton()->get_debugger();
+		String new_name = new_parent->validate_child_name(node->get_name());
+		editor_data->get_undo_redo().add_do_method(sed,"live_debug_reparent_node",edited_scene->get_path_to(node),edited_scene->get_path_to(new_parent),new_name,-1);
+		editor_data->get_undo_redo().add_undo_method(sed,"live_debug_reparent_node",NodePath(String(edited_scene->get_path_to(new_parent))+"/"+new_name),edited_scene->get_path_to(node->get_parent()),node->get_name(),node->get_index());
+
+
 		editor_data->get_undo_redo().add_do_method(this,"_set_owners",edited_scene,owners);
 
 		if (editor->get_animation_editor()->get_root()==node)
@@ -1025,6 +1071,11 @@ void SceneTreeDock::_delete_confirm() {
 			editor_data->get_undo_redo().add_undo_method(this,"_set_owners",edited_scene,owners);
 			//editor_data->get_undo_redo().add_undo_method(n,"set_owner",n->get_owner());
 			editor_data->get_undo_redo().add_undo_reference(n);
+
+			ScriptEditorDebugger *sed = ScriptEditor::get_singleton()->get_debugger();
+			editor_data->get_undo_redo().add_do_method(sed,"live_debug_remove_and_keep_node",edited_scene->get_path_to(n),n->get_instance_ID());
+			editor_data->get_undo_redo().add_undo_method(sed,"live_debug_restore_node",n->get_instance_ID(),edited_scene->get_path_to(n->get_parent()),n->get_index());
+
 		}
 
 
@@ -1038,21 +1089,33 @@ void SceneTreeDock::_update_tool_buttons() {
 
 	Node *sel = scene_tree->get_selected();
 	bool disable = !sel || (sel!=edited_scene && sel->get_owner()!=edited_scene);
+	disable = disable || (edited_scene->get_scene_inherited_state().is_valid() && edited_scene->get_scene_inherited_state()->find_node_by_path(edited_scene->get_path_to(sel))>=0);
 	bool disable_root = disable || sel->get_parent()==scene_root;
+	bool disable_edit = !sel;
 
-	tool_buttons[TOOL_INSTANCE]->set_disabled(disable);
+	tool_buttons[TOOL_INSTANCE]->set_disabled(disable_edit);
 	tool_buttons[TOOL_REPLACE]->set_disabled(disable);
-	tool_buttons[TOOL_CONNECT]->set_disabled(disable);
-	tool_buttons[TOOL_GROUP]->set_disabled(disable);
-	tool_buttons[TOOL_SCRIPT]->set_disabled(disable);
+	tool_buttons[TOOL_CONNECT]->set_disabled(disable_edit);
+	tool_buttons[TOOL_GROUP]->set_disabled(disable_edit);
+	tool_buttons[TOOL_SCRIPT]->set_disabled(disable_edit);
 	tool_buttons[TOOL_MOVE_UP]->set_disabled(disable_root);
 	tool_buttons[TOOL_MOVE_DOWN]->set_disabled(disable_root);
 	tool_buttons[TOOL_DUPLICATE]->set_disabled(disable_root);
 	tool_buttons[TOOL_REPARENT]->set_disabled(disable_root);
 	tool_buttons[TOOL_ERASE]->set_disabled(disable);
+	tool_buttons[TOOL_MULTI_EDIT]->set_disabled(EditorNode::get_singleton()->get_editor_selection()->get_selection().size()<2);
+
 
 }
 
+
+void SceneTreeDock::_selection_changed() {
+
+	tool_buttons[TOOL_MULTI_EDIT]->set_disabled(EditorNode::get_singleton()->get_editor_selection()->get_selection().size()<2);
+
+}
+
+
 void SceneTreeDock::_create() {
 
 
@@ -1082,12 +1145,20 @@ void SceneTreeDock::_create() {
 		editor_data->get_undo_redo().create_action("Create Node");
 
 		if (edited_scene) {
+
 			editor_data->get_undo_redo().add_do_method(parent,"add_child",child);
 			editor_data->get_undo_redo().add_do_method(child,"set_owner",edited_scene);
 			editor_data->get_undo_redo().add_do_method(editor_selection,"clear");
 			editor_data->get_undo_redo().add_do_method(editor_selection,"add_node",child);
 			editor_data->get_undo_redo().add_do_reference(child);
 			editor_data->get_undo_redo().add_undo_method(parent,"remove_child",child);
+
+
+			String new_name = parent->validate_child_name(child->get_type());
+			ScriptEditorDebugger *sed = ScriptEditor::get_singleton()->get_debugger();
+			editor_data->get_undo_redo().add_do_method(sed,"live_debug_create_node",edited_scene->get_path_to(parent),child->get_type(),new_name);
+			editor_data->get_undo_redo().add_undo_method(sed,"live_debug_remove_node",NodePath(String(edited_scene->get_path_to(parent))+"/"+new_name));
+
 		} else {
 
 			editor_data->get_undo_redo().add_do_method(editor,"set_edited_scene",child);
@@ -1229,6 +1300,7 @@ void SceneTreeDock::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("_delete_confirm"),&SceneTreeDock::_delete_confirm);
 	ObjectTypeDB::bind_method(_MD("_node_prerenamed"),&SceneTreeDock::_node_prerenamed);
 	ObjectTypeDB::bind_method(_MD("_import_subscene"),&SceneTreeDock::_import_subscene);
+	ObjectTypeDB::bind_method(_MD("_selection_changed"),&SceneTreeDock::_selection_changed);
 
 	ObjectTypeDB::bind_method(_MD("instance"),&SceneTreeDock::instance);
 }
@@ -1332,6 +1404,12 @@ SceneTreeDock::SceneTreeDock(EditorNode *p_editor,Node *p_scene_root,EditorSelec
 	hbc_bottom->add_spacer();
 
 	tb = memnew( ToolButton );
+	tb->connect("pressed",this,"_tool_selected",make_binds(TOOL_MULTI_EDIT, false));
+	tb->set_tooltip("Multi-Edit Selected Nodes");
+	hbc_bottom->add_child(tb);
+	tool_buttons[TOOL_MULTI_EDIT]=tb;
+
+	tb = memnew( ToolButton );
 	tb->connect("pressed",this,"_tool_selected",make_binds(TOOL_ERASE, false));
 	tb->set_tooltip("Erase Selected Node(s)");
 	hbc_bottom->add_child(tb);
diff --git a/tools/editor/scene_tree_dock.h b/tools/editor/scene_tree_dock.h
index f0bbbad6be..b1c53d2ff9 100644
--- a/tools/editor/scene_tree_dock.h
+++ b/tools/editor/scene_tree_dock.h
@@ -62,6 +62,7 @@ class SceneTreeDock : public VBoxContainer {
 		TOOL_MOVE_DOWN,
 		TOOL_DUPLICATE,
 		TOOL_REPARENT,
+		TOOL_MULTI_EDIT,
 		TOOL_ERASE,
 		TOOL_BUTTON_MAX
 	};
@@ -119,6 +120,7 @@ class SceneTreeDock : public VBoxContainer {
 	void _import_subscene();
 
 	bool _validate_no_foreign();
+	void _selection_changed();
 
 	void _fill_path_renames(Vector<StringName> base_path,Vector<StringName> new_base_path,Node * p_node, List<Pair<NodePath,NodePath> > *p_renames);
 
diff --git a/tools/editor/scene_tree_editor.cpp b/tools/editor/scene_tree_editor.cpp
index fd841028a2..60395d5ff5 100644
--- a/tools/editor/scene_tree_editor.cpp
+++ b/tools/editor/scene_tree_editor.cpp
@@ -34,6 +34,8 @@
 #include "scene/main/viewport.h"
 #include "tools/editor/plugins/canvas_item_editor_plugin.h"
 
+#include "scene/resources/packed_scene.h"
+
 Node *SceneTreeEditor::get_scene_node() {
 
 	ERR_FAIL_COND_V(!is_inside_tree(),NULL);
@@ -57,22 +59,58 @@ void SceneTreeEditor::_subscene_option(int p_idx) {
 
 	switch(p_idx) {
 
-		case SCENE_MENU_SHOW_CHILDREN: {
+		case SCENE_MENU_EDITABLE_CHILDREN: {
 
-			if (node->has_meta("__editor_show_subtree")) {
-				instance_menu->set_item_checked(0,true);
-				node->set_meta("__editor_show_subtree",Variant());
-				_update_tree();
-			} else {
-				node->set_meta("__editor_show_subtree",true);
-				_update_tree();
+			bool editable = EditorNode::get_singleton()->get_edited_scene()->is_editable_instance(node);
+			editable = !editable;
+
+			//node->set_instance_children_editable(editable);
+			EditorNode::get_singleton()->get_edited_scene()->set_editable_instance(node,editable);
+			instance_menu->set_item_checked(0,editable);
+			if (editable) {
+				node->set_scene_instance_load_placeholder(false);
+				instance_menu->set_item_checked(1,false);
+			}
+
+			_update_tree();
+
+		} break;
+		case SCENE_MENU_USE_PLACEHOLDER: {
+
+			bool placeholder = node->get_scene_instance_load_placeholder();
+			placeholder = !placeholder;
+
+			//node->set_instance_children_editable(editable);
+			if (placeholder) {
+				EditorNode::get_singleton()->get_edited_scene()->set_editable_instance(node,false);
 			}
+			node->set_scene_instance_load_placeholder(placeholder);
+			instance_menu->set_item_checked(0,false);
+			instance_menu->set_item_checked(1,placeholder);
+
+			_update_tree();
 
 		} break;
 		case SCENE_MENU_OPEN: {
 
 			emit_signal("open",node->get_filename());
 		} break;
+		case SCENE_MENU_CLEAR_INHERITANCE: {
+			clear_inherit_confirm->popup_centered_minsize();
+		} break;
+		case SCENE_MENU_OPEN_INHERITED: {
+			if (node && node->get_scene_inherited_state().is_valid()) {
+				emit_signal("open",node->get_scene_inherited_state()->get_path());
+			}
+		} break;
+		case SCENE_MENU_CLEAR_INHERITANCE_CONFIRM: {
+			if (node && node->get_scene_inherited_state().is_valid()) {
+				node->set_scene_inherited_state(Ref<SceneState>());
+				update_tree();
+				EditorNode::get_singleton()->get_property_editor()->update_tree();
+			}
+
+		} break;
 
 	}
 
@@ -94,15 +132,33 @@ void SceneTreeEditor::_cell_button_pressed(Object *p_item,int p_column,int p_id)
 		Rect2 item_rect = tree->get_item_rect(item,0);
 		item_rect.pos.y-=tree->get_scroll().y;
 		item_rect.pos+=tree->get_global_pos();
-		instance_menu->set_pos(item_rect.pos+Vector2(0,item_rect.size.y));
-		instance_menu->set_size(Vector2(item_rect.size.x,0));
-		if (n->has_meta("__editor_show_subtree"))
-			instance_menu->set_item_checked(0,true);
-		else
-			instance_menu->set_item_checked(0,false);
 
-		instance_menu->popup();
-		instance_node=n->get_instance_ID();
+		if (n==get_scene_node()) {
+			inheritance_menu->set_pos(item_rect.pos+Vector2(0,item_rect.size.y));
+			inheritance_menu->set_size(Vector2(item_rect.size.x,0));
+			inheritance_menu->popup();
+			instance_node=n->get_instance_ID();
+
+		} else {
+			instance_menu->set_pos(item_rect.pos+Vector2(0,item_rect.size.y));
+			instance_menu->set_size(Vector2(item_rect.size.x,0));
+			if (EditorNode::get_singleton()->get_edited_scene()->is_editable_instance(n))
+				instance_menu->set_item_checked(0,true);
+			else
+				instance_menu->set_item_checked(0,false);
+
+			if (n->get_owner()==get_scene_node()) {
+				instance_menu->set_item_checked(1,n->get_scene_instance_load_placeholder());
+				instance_menu->set_item_disabled(1,false);
+			} else {
+
+				instance_menu->set_item_checked(1,false);
+				instance_menu->set_item_disabled(1,true);
+			}
+
+			instance_menu->popup();
+			instance_node=n->get_instance_ID();
+		}
 		//emit_signal("open",n->get_filename());
 	} else if (p_id==BUTTON_SCRIPT) {
 		RefPtr script=n->get_script();
@@ -168,20 +224,22 @@ void SceneTreeEditor::_add_nodes(Node *p_node,TreeItem *p_parent) {
 
 	bool part_of_subscene=false;
 
-	if (!display_foreign && p_node->get_owner()!=get_scene_node() && p_node!=get_scene_node()) {
+	if (!display_foreign && p_node->get_owner()!=get_scene_node()  && p_node!=get_scene_node()) {
 
-		if ((show_enabled_subscene || can_open_instance) && p_node->get_owner() && p_node->get_owner()->get_owner()==get_scene_node() && p_node->get_owner()->has_meta("__editor_show_subtree")) {
+		if ((show_enabled_subscene || can_open_instance) && p_node->get_owner() && (get_scene_node()->is_editable_instance(p_node->get_owner()))) {
 
 			part_of_subscene=true;
 			//allow
 		} else {
 			return;
 		}
+	} else {
+		part_of_subscene = get_scene_node()->get_scene_inherited_state().is_valid() && get_scene_node()->get_scene_inherited_state()->find_node_by_path(get_scene_node()->get_path_to(p_node))>=0;
 	}
 
 	TreeItem *item = tree->create_item(p_parent);
 	item->set_text(0, p_node->get_name() );
-	if (can_rename && (p_node->get_owner() == get_scene_node() || p_node==get_scene_node()))
+	if (can_rename && !part_of_subscene /*(p_node->get_owner() == get_scene_node() || p_node==get_scene_node())*/)
 		item->set_editable(0, true);
 
 	item->set_selectable(0,true);
@@ -199,6 +257,7 @@ void SceneTreeEditor::_add_nodes(Node *p_node,TreeItem *p_parent) {
 		icon=get_icon( (has_icon(p_node->get_type(),"EditorIcons")?p_node->get_type():String("Object")),"EditorIcons");
 	item->set_icon(0, icon );
 	item->set_metadata( 0,p_node->get_path() );	
+
 	if (part_of_subscene) {
 
 		//item->set_selectable(0,marked_selectable);
@@ -221,7 +280,10 @@ void SceneTreeEditor::_add_nodes(Node *p_node,TreeItem *p_parent) {
 		}
 	}
 
-	if (p_node!=get_scene_node() && p_node->get_filename()!="" && can_open_instance) {
+	if (p_node==get_scene_node() && p_node->get_scene_inherited_state().is_valid()) {
+		item->add_button(0,get_icon("InstanceOptions","EditorIcons"),BUTTON_SUBSCENE);
+		item->set_tooltip(0,"Inherits: "+p_node->get_scene_inherited_state()->get_path()+"\nType: "+p_node->get_type());
+	} else if (p_node!=get_scene_node() && p_node->get_filename()!="" && can_open_instance) {
 
 		item->add_button(0,get_icon("InstanceOptions","EditorIcons"),BUTTON_SUBSCENE);
 		item->set_tooltip(0,"Instance: "+p_node->get_filename()+"\nType: "+p_node->get_type());
@@ -487,8 +549,11 @@ void SceneTreeEditor::_notification(int p_what) {
 
 		get_tree()->connect("tree_changed",this,"_tree_changed");
 		get_tree()->connect("node_removed",this,"_node_removed");
-		instance_menu->set_item_icon(2,get_icon("Load","EditorIcons"));
+		instance_menu->set_item_icon(3,get_icon("Load","EditorIcons"));
 		tree->connect("item_collapsed",this,"_cell_collapsed");
+		inheritance_menu->set_item_icon(2,get_icon("Load","EditorIcons"));
+		clear_inherit_confirm->connect("confirmed",this,"_subscene_option",varray(SCENE_MENU_CLEAR_INHERITANCE_CONFIRM));
+
 
 //		get_scene()->connect("tree_changed",this,"_tree_changed",Vector<Variant>(),CONNECT_DEFERRED);
 //		get_scene()->connect("node_removed",this,"_node_removed",Vector<Variant>(),CONNECT_DEFERRED);
@@ -499,6 +564,7 @@ void SceneTreeEditor::_notification(int p_what) {
 		get_tree()->disconnect("tree_changed",this,"_tree_changed");
 		get_tree()->disconnect("node_removed",this,"_node_removed");
 		tree->disconnect("item_collapsed",this,"_cell_collapsed");
+		clear_inherit_confirm->disconnect("confirmed",this,"_subscene_option");
 		_update_tree();
 	}
 
@@ -788,12 +854,27 @@ SceneTreeEditor::SceneTreeEditor(bool p_label,bool p_can_rename, bool p_can_open
 	blocked=0;
 
 	instance_menu = memnew( PopupMenu );
-	instance_menu->add_check_item("Show Children",SCENE_MENU_SHOW_CHILDREN);
+	instance_menu->add_check_item("Editable Children",SCENE_MENU_EDITABLE_CHILDREN);
+	instance_menu->add_check_item("Load As Placeholder",SCENE_MENU_USE_PLACEHOLDER);
 	instance_menu->add_separator();
 	instance_menu->add_item("Open in Editor",SCENE_MENU_OPEN);
 	instance_menu->connect("item_pressed",this,"_subscene_option");
 	add_child(instance_menu);
 
+	inheritance_menu = memnew( PopupMenu );
+	inheritance_menu->add_item("Clear Inheritance",SCENE_MENU_CLEAR_INHERITANCE);
+	inheritance_menu->add_separator();
+	inheritance_menu->add_item("Open in Editor",SCENE_MENU_OPEN_INHERITED);
+	inheritance_menu->connect("item_pressed",this,"_subscene_option");
+
+	add_child(inheritance_menu);
+
+	clear_inherit_confirm = memnew( ConfirmationDialog );
+	clear_inherit_confirm->set_text("Clear Inheritance? (No Undo!)");
+	clear_inherit_confirm->get_ok()->set_text("Clear!");
+	add_child(clear_inherit_confirm);
+
+
 }
 
 
diff --git a/tools/editor/scene_tree_editor.h b/tools/editor/scene_tree_editor.h
index b05a52a2da..50cca4e24b 100644
--- a/tools/editor/scene_tree_editor.h
+++ b/tools/editor/scene_tree_editor.h
@@ -52,16 +52,22 @@ class SceneTreeEditor : public Control {
 	};
 
 	enum {
-		SCENE_MENU_SHOW_CHILDREN,
+		SCENE_MENU_EDITABLE_CHILDREN,
+		SCENE_MENU_USE_PLACEHOLDER,
 		SCENE_MENU_OPEN,
+		SCENE_MENU_CLEAR_INHERITANCE,
+		SCENE_MENU_OPEN_INHERITED,
+		SCENE_MENU_CLEAR_INHERITANCE_CONFIRM,
 	};
 
 	Tree *tree;
 	Node *selected;
 	PopupMenu *instance_menu;
+	PopupMenu *inheritance_menu;
 	ObjectID instance_node;
 
 	AcceptDialog *error;
+	ConfirmationDialog *clear_inherit_confirm;
 
 	int blocked;
 	
diff --git a/tools/editor/scenes_dock.cpp b/tools/editor/scenes_dock.cpp
index 9153616775..7d9c5b24b2 100644
--- a/tools/editor/scenes_dock.cpp
+++ b/tools/editor/scenes_dock.cpp
@@ -35,15 +35,30 @@
 #include "os/os.h"
 #include "editor_node.h"
 
+#include "editor_settings.h"
+
 bool ScenesDock::_create_tree(TreeItem *p_parent,EditorFileSystemDirectory *p_dir) {
 
-	String search_term = tree_filter->get_search_term();
-	ScenesDockFilter::FilterOption file_filter = tree_filter->get_file_filter();
 
 	TreeItem *item = tree->create_item(p_parent);
-	item->set_text(0,p_dir->get_name()+"/");
+	String dname=p_dir->get_name();
+	if (dname=="")
+		dname="res://";
+
+	item->set_text(0,dname);
 	item->set_icon(0,get_icon("Folder","EditorIcons"));
-	item->set_custom_bg_color(0,get_color("prop_subsection","Editor"));
+	item->set_selectable(0,true);
+	String lpath = p_dir->get_path();
+	if (lpath!="res://" && lpath.ends_with("/")) {
+		lpath=lpath.substr(0,lpath.length()-1);
+	}
+	item->set_metadata(0,lpath);
+	if (lpath==path) {
+		item->select(0);
+	}
+
+
+	//item->set_custom_bg_color(0,get_color("prop_subsection","Editor"));
 
 	bool has_items=false;
 
@@ -52,7 +67,7 @@ bool ScenesDock::_create_tree(TreeItem *p_parent,EditorFileSystemDirectory *p_di
 		if (_create_tree(item,p_dir->get_subdir(i)))
 			has_items=true;
 	}
-
+#if 0
 	for (int i=0;i<p_dir->get_file_count();i++) {
 
 		String file_name = p_dir->get_file(i);
@@ -89,13 +104,13 @@ bool ScenesDock::_create_tree(TreeItem *p_parent,EditorFileSystemDirectory *p_di
 		has_items=true;
 
 	}
-
-	if (!has_items) {
+#endif
+	/*if (!has_items) {
 
 		memdelete(item);
 		return false;
 
-	}
+	}*/
 
 	return true;
 }
@@ -105,7 +120,28 @@ void ScenesDock::_update_tree() {
 
 	tree->clear();
 	updating_tree=true;
-	_create_tree(NULL,EditorFileSystem::get_singleton()->get_filesystem());
+	TreeItem *root = tree->create_item();
+	TreeItem *favorites = tree->create_item(root);
+	favorites->set_icon(0, get_icon("Favorites","EditorIcons") );
+	favorites->set_text(0,"Favorites:");
+	favorites->set_selectable(0,false);
+	Vector<String> faves = 	EditorSettings::get_singleton()->get_favorite_dirs();
+	for(int i=0;i<faves.size();i++) {
+		if (!faves[i].begins_with("res://"))
+			continue;
+
+		TreeItem *ti = tree->create_item(favorites);
+		String fv = faves[i];
+		if (fv=="res://")
+			ti->set_text(0,"/");
+		else
+			ti->set_text(0,faves[i].get_file());
+		ti->set_icon(0,get_icon("Folder","EditorIcons"));
+		ti->set_selectable(0,true);
+		ti->set_metadata(0,faves[i]);
+	}
+
+	_create_tree(root,EditorFileSystem::get_singleton()->get_filesystem());
 	updating_tree=false;
 
 }
@@ -117,68 +153,192 @@ void ScenesDock::_notification(int p_what) {
 
 		case NOTIFICATION_ENTER_TREE: {
 
+			if (initialized)
+				return;
+			initialized=false;
 
-			EditorFileSystem::get_singleton()->connect("filesystem_changed",this,"_update_tree");
+			EditorFileSystem::get_singleton()->connect("filesystem_changed",this,"_fs_changed");
 
 			button_reload->set_icon( get_icon("Reload","EditorIcons"));
 			button_favorite->set_icon( get_icon("Favorites","EditorIcons"));
+			button_fav_up->set_icon( get_icon("MoveUp","EditorIcons"));
+			button_fav_down->set_icon( get_icon("MoveDown","EditorIcons"));
 			button_instance->set_icon( get_icon("Add","EditorIcons"));
 			button_open->set_icon( get_icon("Folder","EditorIcons"));
+			button_back->set_icon( get_icon("Filesystem","EditorIcons"));
+			display_mode->set_icon( get_icon("FileList","EditorIcons"));
+			display_mode->connect("pressed",this,"_change_file_display");
+			file_options->set_icon( get_icon("Tools","EditorIcons"));
+			files->connect("item_activated",this,"_select_file");
+			button_hist_next->connect("pressed",this,"_fw_history");
+			button_hist_prev->connect("pressed",this,"_bw_history");
 
-			String path = Globals::get_singleton()->get_resource_path()+"/favorites.cfg";
-			FileAccess *f=FileAccess::open(path,FileAccess::READ);
-			if (f) {
+			button_hist_next->set_icon( get_icon("Forward","EditorIcons"));
+			button_hist_prev->set_icon( get_icon("Back","EditorIcons"));
+			file_options->get_popup()->connect("item_pressed",this,"_file_option");
 
-				String l = f->get_line();
 
-				while(l!="") {
-					favorites.insert(l);
-					l = f->get_line();
-
-				}
+			button_back->connect("pressed",this,"_go_to_tree",varray(),CONNECT_DEFERRED);
+			current_path->connect("text_entered",this,"_go_to_dir");
+			_update_tree(); //maybe it finished already
 
-				f->close();
-				memdelete(f);
+			if (EditorFileSystem::get_singleton()->is_scanning()) {
+				_set_scannig_mode();
 			}
 
-
-
-			_update_tree(); //maybe it finished already
+		} break;
+		case NOTIFICATION_PROCESS: {
+			if (EditorFileSystem::get_singleton()->is_scanning()) {
+				scanning_progress->set_val(EditorFileSystem::get_singleton()->get_scanning_progress()*100);
+			}
 		} break;
 		case NOTIFICATION_EXIT_TREE: {
 
 		} break;
-		case NOTIFICATION_PROCESS: {
 
-		} break;
 	}
 
 }
 
-void ScenesDock::_favorite_toggled() {
 
-	if (updating_tree)
+
+
+void ScenesDock::_dir_selected() {
+
+	TreeItem *ti = tree->get_selected();
+	if (!ti)
 		return;
+	String dir = ti->get_metadata(0);
+	bool found=false;
+	Vector<String> favorites = EditorSettings::get_singleton()->get_favorite_dirs();
+	for(int i=0;i<favorites.size();i++) {
+
+		if (favorites[i]==dir) {
+			found=true;
+			break;
+		}
+	}
+
+
+	button_favorite->set_pressed(found);
+	if (ti->get_parent() && ti->get_parent()->get_parent()==tree->get_root() && !ti->get_parent()->get_prev()) {
+
+		//a favorite!!!
+		button_fav_up->set_disabled(!ti->get_prev());
+		button_fav_down->set_disabled(!ti->get_next());
+	} else {
+		button_fav_up->set_disabled(true);
+		button_fav_down->set_disabled(true);
+
+	}
 
+}
+
+void ScenesDock::_fav_up_pressed() {
 
 	TreeItem *sel = tree->get_selected();
 	if (!sel)
-		return; //?
+		return ;
 
-	bool faved = sel->is_checked(0);
-	String path = sel->get_metadata(0);
-	if (faved)
-		favorites.insert(path);
-	else
-		favorites.erase(path);
+	if (!sel->get_prev())
+		return;
+
+	String sw = sel->get_prev()->get_metadata(0);
+	String txt = sel->get_metadata(0);
+
+	Vector<String> favorited = EditorSettings::get_singleton()->get_favorite_dirs();
+
+	int a_idx=favorited.find(sw);
+	int b_idx=favorited.find(txt);
+
+	if (a_idx==-1 || b_idx==-1)
+		return;
+	SWAP(favorited[a_idx],favorited[b_idx]);
+
+	EditorSettings::get_singleton()->set_favorite_dirs(favorited);
+
+	_update_tree();
 
-	timer->start();
+	if (!tree->get_root() || !tree->get_root()->get_children() || !tree->get_root()->get_children()->get_children())
+		return;
+	sel = tree->get_root()->get_children()->get_children();
+	while(sel) {
 
+		String t = sel->get_metadata(0);
+		if (t==txt) {
+			sel->select(0);
+			return;
+		}
+		sel=sel->get_next();
+	}
 }
 
-void ScenesDock::_favorites_toggled(bool p_toggled) {
+void ScenesDock::_fav_down_pressed() {
+
+	TreeItem *sel = tree->get_selected();
+	if (!sel)
+		return ;
+
+	if (!sel->get_next())
+		return;
+
+	String sw = sel->get_next()->get_metadata(0);
+	String txt = sel->get_metadata(0);
+
+	Vector<String> favorited = EditorSettings::get_singleton()->get_favorite_dirs();
+
+	int a_idx=favorited.find(sw);
+	int b_idx=favorited.find(txt);
+
+	if (a_idx==-1 || b_idx==-1)
+		return;
+	SWAP(favorited[a_idx],favorited[b_idx]);
+
+	EditorSettings::get_singleton()->set_favorite_dirs(favorited);
 
 	_update_tree();
+
+	if (!tree->get_root() || !tree->get_root()->get_children() || !tree->get_root()->get_children()->get_children())
+		return;
+	sel = tree->get_root()->get_children()->get_children();
+	while(sel) {
+
+		String t = sel->get_metadata(0);
+		if (t==txt) {
+			sel->select(0);
+			return;
+		}
+		sel=sel->get_next();
+	}
+}
+
+void ScenesDock::_favorites_pressed() {
+
+	TreeItem *sel = tree->get_selected();
+	if (!sel)
+		return ;
+	String dir = sel->get_metadata(0);
+
+	int idx = -1;
+	Vector<String> favorites = EditorSettings::get_singleton()->get_favorite_dirs();
+	for(int i=0;i<favorites.size();i++) {
+
+		if (favorites[i]==dir) {
+			idx=i;
+			break;
+		}
+	}
+
+	if (button_favorite->is_pressed() && idx==-1) {
+		favorites.push_back(dir);
+		EditorSettings::get_singleton()->set_favorite_dirs(favorites);
+		_update_tree();
+	} else if (!button_favorite->is_pressed() && idx!=-1) {
+		favorites.remove(idx);
+		EditorSettings::get_singleton()->set_favorite_dirs(favorites);
+		_update_tree();
+	}
+
 }
 
 String ScenesDock::get_selected_path() const {
@@ -199,65 +359,712 @@ void ScenesDock::_instance_pressed() {
 	emit_signal("instance",path);
 }
 
-void ScenesDock::_open_pressed(){
+void ScenesDock::_thumbnail_done(const String& p_path,const Ref<Texture>& p_preview, const Variant& p_udata) {
 
-	TreeItem *sel = tree->get_selected();
-	if (!sel) {
+	if (p_preview.is_valid() && path==p_path.get_base_dir()) {
+
+		int idx=p_udata;
+		if (idx>=files->get_item_count())
+			return;
+		String fpath = files->get_item_metadata(idx);
+		if (fpath!=p_path)
+			return;
+		files->set_item_icon(idx,p_preview);
+
+	}
+
+}
+
+void ScenesDock::_change_file_display() {
+
+	if (display_mode->is_pressed()) {
+		display_mode->set_icon( get_icon("FileThumbnail","EditorIcons"));
+
+	} else {
+		display_mode->set_icon( get_icon("FileList","EditorIcons"));
+	}
+
+	_update_files(true);
+}
+
+void ScenesDock::_update_files(bool p_keep_selection) {
+
+	Set<String> cselection;
+
+	if (p_keep_selection) {
+
+		for(int i=0;i<files->get_item_count();i++) {
+
+			if (files->is_selected(i))
+				cselection.insert(files->get_item_text(i));
+		}
+	}
+
+	files->clear();
+
+	EditorFileSystemDirectory *efd = EditorFileSystem::get_singleton()->get_path(path);
+	if (!efd)
 		return;
+
+	int thumbnail_size = EditorSettings::get_singleton()->get("file_dialog/thumbnail_size");
+	Ref<Texture> folder_thumbnail;
+	Ref<Texture> file_thumbnail;
+
+	bool use_thumbnails=!display_mode->is_pressed();
+
+	if (use_thumbnails) { //thumbnails
+
+		files->set_max_columns(0);
+		files->set_icon_mode(ItemList::ICON_MODE_TOP);
+		files->set_fixed_column_width(thumbnail_size*3/2);
+		files->set_max_text_lines(2);
+		files->set_min_icon_size(Size2(thumbnail_size,thumbnail_size));
+
+		if (!has_icon("ResizedFolder","EditorIcons")) {
+			Ref<ImageTexture> folder = get_icon("FolderBig","EditorIcons");
+			Image img = folder->get_data();
+			img.resize(thumbnail_size,thumbnail_size);
+			Ref<ImageTexture> resized_folder = Ref<ImageTexture>( memnew( ImageTexture));
+			resized_folder->create_from_image(img,0);
+			Theme::get_default()->set_icon("ResizedFolder","EditorIcons",resized_folder);
+		}
+
+		folder_thumbnail = get_icon("ResizedFolder","EditorIcons");
+
+		if (!has_icon("ResizedFile","EditorIcons")) {
+			Ref<ImageTexture> file = get_icon("FileBig","EditorIcons");
+			Image img = file->get_data();
+			img.resize(thumbnail_size,thumbnail_size);
+			Ref<ImageTexture> resized_file = Ref<ImageTexture>( memnew( ImageTexture));
+			resized_file->create_from_image(img,0);
+			Theme::get_default()->set_icon("ResizedFile","EditorIcons",resized_file);
+		}
+
+		file_thumbnail = get_icon("ResizedFile","EditorIcons");
+
+	} else {
+
+		files->set_icon_mode(ItemList::ICON_MODE_LEFT);
+		files->set_max_columns(1);
+		files->set_max_text_lines(1);
+		files->set_fixed_column_width(0);
+		files->set_min_icon_size(Size2());
+
 	}
-	String path = sel->get_metadata(0);
 
-	if (ResourceLoader::get_resource_type(path)=="PackedScene") {
 
-		editor->open_request(path);
+	if (path!="res://") {
+
+		if (use_thumbnails) {
+			files->add_item("..",folder_thumbnail,true);
+		} else {
+			files->add_item("..",get_icon("folder","FileDialog"),true);
+		}
+
+		String bd = path.get_base_dir();
+		if (bd!="res://" && !bd.ends_with("/"))
+			bd+="/";
+
+		files->set_item_metadata(files->get_item_count()-1,bd);
+	}
+
+	for(int i=0;i<efd->get_subdir_count();i++) {
+
+		String dname=efd->get_subdir(i)->get_name();
+
+
+		if (use_thumbnails) {
+			files->add_item(dname,folder_thumbnail,true);
+		} else {
+			files->add_item(dname,get_icon("folder","FileDialog"),true);
+		}
+
+		files->set_item_metadata(files->get_item_count()-1,path.plus_file(dname)+"/");
+
+		if (cselection.has(dname))
+			files->select(files->get_item_count()-1,false);
+	}
+
+	for(int i=0;i<efd->get_file_count();i++) {
+
+		String fname=efd->get_file(i);
+		String fp = path.plus_file(fname);
+
+
+		String type = efd->get_file_type(i);
+		Ref<Texture> type_icon;
+
+		if (has_icon(type,"EditorIcons")) {
+			type_icon=get_icon(type,"EditorIcons");
+		} else {
+			type_icon=get_icon("Object","EditorIcons");
+		}
+
+		if (use_thumbnails) {
+			files->add_item(fname,file_thumbnail,true);
+			files->set_item_metadata(files->get_item_count()-1,fp);
+			files->set_item_tag_icon(files->get_item_count()-1,type_icon);
+			EditorResourcePreview::get_singleton()->queue_resource_preview(fp,this,"_thumbnail_done",files->get_item_count()-1);
+		} else {
+			files->add_item(fname,type_icon,true);
+			files->set_item_metadata(files->get_item_count()-1,fp);
+
+		}
+
+		if (cselection.has(fname))
+			files->select(files->get_item_count()-1,false);
+
+	}
+
+
+}
+
+void ScenesDock::_select_file(int p_idx) {
+
+	files->select(p_idx,true);
+	_open_pressed();
+}
+
+void ScenesDock::_go_to_tree() {
+
+	tree->show();
+	files->hide();
+	path_hb->hide();
+	_update_tree();
+	tree->grab_focus();
+	tree->ensure_cursor_is_visible();
+	button_favorite->show();
+	button_fav_up->show();
+	button_fav_down->show();
+	button_open->hide();
+	button_instance->hide();
+	button_open->hide();
+	file_options->hide();
+	tree_mode=true;
+}
+
+void ScenesDock::_go_to_dir(const String& p_dir){
+
+	DirAccess *da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
+	if (da->change_dir(p_dir)==OK) {
+		path=da->get_current_dir();
+		_update_files(false);
+	}
+	current_path->set_text(path);
+	memdelete(da);
+
+
+}
+void ScenesDock::_fs_changed() {
+
+	button_hist_prev->set_disabled(history_pos==0);
+	button_hist_next->set_disabled(history_pos+1==history.size());
+	scanning_vb->hide();
+
+	if (tree_mode) {
+
+		tree->show();
+		button_favorite->show();
+		button_fav_up->show();
+		button_fav_down->show();
+		_update_tree();
+	} else {
+		files->show();
+		path_hb->show();
+		button_instance->show();
+		button_open->show();
+		file_options->show();
+		_update_files(true);
+	}
+
+	set_process(false);
+}
+
+void ScenesDock::_set_scannig_mode() {
+
+	tree->hide();
+	button_favorite->hide();
+	button_fav_up->hide();
+	button_fav_down->hide();
+	button_instance->hide();
+	button_open->hide();
+	file_options->hide();
+	button_hist_prev->set_disabled(true);
+	button_hist_next->set_disabled(true);
+	scanning_vb->show();
+	path_hb->hide();
+	files->hide();
+	set_process(true);
+	if (EditorFileSystem::get_singleton()->is_scanning()) {
+		scanning_progress->set_val(EditorFileSystem::get_singleton()->get_scanning_progress()*100);
+	} else {
+		scanning_progress->set_val(0);
+	}
+
+}
+
+void ScenesDock::_fw_history() {
+
+	if (history_pos<history.size()-1)
+		history_pos++;
+
+	path=history[history_pos];
+
+	if (tree_mode) {
+		_update_tree();
+		tree->grab_focus();
+		tree->ensure_cursor_is_visible();
+	} else {
+		_update_files(false);
+		current_path->set_text(path);
+	}
+
+	button_hist_prev->set_disabled(history_pos==0);
+	button_hist_next->set_disabled(history_pos+1==history.size());
+
+}
+
+void ScenesDock::_bw_history() {
+
+	if (history_pos>0)
+		history_pos--;
+
+	path=history[history_pos];
+
+	if (tree_mode) {
+		_update_tree();
+		tree->grab_focus();
+		tree->ensure_cursor_is_visible();
 	} else {
+		_update_files(false);
+		current_path->set_text(path);
+	}
+
+	button_hist_prev->set_disabled(history_pos==0);
+	button_hist_next->set_disabled(history_pos+1==history.size());
+
+}
+
+void ScenesDock::_push_to_history() {
 
-		/*
+	history.resize(history_pos+1);
+	if (history[history_pos]!=path) {
+		history.push_back(path);
+		history_pos++;
+	}
+
+	button_hist_prev->set_disabled(history_pos==0);
+	button_hist_next->set_disabled(history_pos+1==history.size());
+
+}
+
+
+void ScenesDock::_find_inside_move_files(EditorFileSystemDirectory *efsd,Vector<String>& files) {
 
-		RES res = ResourceLoader::load(path);
-		if (res.is_null()) {
+	for(int i=0;i<efsd->get_subdir_count();i++) {
+		_find_inside_move_files(efsd->get_subdir(i),files);
+	}
+	for(int i=0;i<efsd->get_file_count();i++) {
+		files.push_back(efsd->get_file_path(i));
+	}
+
+}
 
+void ScenesDock::_find_remaps(EditorFileSystemDirectory *efsd,Map<String,String> &renames,List<String>& to_remaps) {
 
+	for(int i=0;i<efsd->get_subdir_count();i++) {
+		_find_remaps(efsd->get_subdir(i),renames,to_remaps);
+	}
+	for(int i=0;i<efsd->get_file_count();i++) {
+		Vector<String> deps=efsd->get_file_deps(i);
+		for(int j=0;j<deps.size();j++) {
+			if (renames.has(deps[j])) {
+				to_remaps.push_back(efsd->get_file_path(i));
+				break;
+			}
+		}
+	}
+}
+
+
+void ScenesDock::_rename_operation(const String& p_to_path) {
+
+	if (move_files[0]==p_to_path) {
+		EditorNode::get_singleton()->show_warning("Same source and destination files, doing nothing.");
+		return;
+	}
+	if (FileAccess::exists(p_to_path)) {
+		EditorNode::get_singleton()->show_warning("Target file exists, can't overwrite. Delete first.");
+		return;
+	}
+
+	Map<String,String> renames;
+	renames[move_files[0]]=p_to_path;
+
+	List<String> remap;
+
+	_find_remaps(EditorFileSystem::get_singleton()->get_filesystem(),renames,remap);
+	print_line("found files to remap: "+itos(remap.size()));
+
+	//perform remaps
+	for(List<String>::Element *E=remap.front();E;E=E->next()) {
+
+		Error err = ResourceLoader::rename_dependencies(E->get(),renames);
+		print_line("remapping: "+E->get());
+
+		if (err!=OK) {
+			EditorNode::get_singleton()->add_io_error("Can't rename deps for:\n"+E->get()+"\n");
+		}
+	}
+
+	//finally, perform moves
+
+	DirAccess *da=DirAccess::create(DirAccess::ACCESS_RESOURCES);
+
+	Error err = da->rename(move_files[0],p_to_path);
+	print_line("moving file "+move_files[0]+" to "+p_to_path);
+	if (err!=OK) {
+		EditorNode::get_singleton()->add_io_error("Error moving file:\n"+move_files[0]+"\n");
+	}
+
+	//rescan everything
+	memdelete(da);
+	print_line("call rescan!");
+	_rescan();
+}
+
+
+void ScenesDock::_move_operation(const String& p_to_path) {
+
+	if (p_to_path==path) {
+		EditorNode::get_singleton()->show_warning("Same source and destination paths, doing nothing.");
+		return;
+	}
+
+	//find files inside dirs to be moved
+
+	Vector<String> inside_files;
+
+	for(int i=0;i<move_dirs.size();i++) {
+		if (p_to_path.begins_with(move_dirs[i])) {
+			EditorNode::get_singleton()->show_warning("Can't move directories to within themselves");
 			return;
-		}*/
+		}
 
-		editor->load_resource(path);
+		EditorFileSystemDirectory *efsd=EditorFileSystem::get_singleton()->get_path(move_dirs[i]);
+		if (!efsd)
+			continue;
+		_find_inside_move_files(efsd,inside_files);
 	}
 
-//	emit_signal("open",path);
+	//make list of remaps
+	Map<String,String> renames;
+	String repfrom=path=="res://"?path:String(path+"/");
+	String repto=p_to_path=="res://"?p_to_path:String(p_to_path+"/");
+
+	for(int i=0;i<move_files.size();i++) {
+		renames[move_files[i]]=move_files[i].replace_first(repfrom,repto);
+		print_line("move file "+move_files[i]+" -> "+renames[move_files[i]]);
+	}
+	for(int i=0;i<inside_files.size();i++) {
+		renames[inside_files[i]]=inside_files[i].replace_first(repfrom,repto);
+		print_line("inside file "+inside_files[i]+" -> "+renames[inside_files[i]]);
+	}
+
+	//make list of files that will be run the remapping
+	List<String> remap;
 
+	_find_remaps(EditorFileSystem::get_singleton()->get_filesystem(),renames,remap);
+	print_line("found files to remap: "+itos(remap.size()));
+
+	//perform remaps
+	for(List<String>::Element *E=remap.front();E;E=E->next()) {
+
+		Error err = ResourceLoader::rename_dependencies(E->get(),renames);
+		print_line("remapping: "+E->get());
+
+		if (err!=OK) {
+			EditorNode::get_singleton()->add_io_error("Can't rename deps for:\n"+E->get()+"\n");
+		}
+	}
+
+	//finally, perform moves
+
+	DirAccess *da=DirAccess::create(DirAccess::ACCESS_RESOURCES);
+
+	for(int i=0;i<move_files.size();i++) {
+
+		String to = move_files[i].replace_first(repfrom,repto);
+		Error err = da->rename(move_files[i],to);
+		print_line("moving file "+move_files[i]+" to "+to);
+		if (err!=OK) {
+			EditorNode::get_singleton()->add_io_error("Error moving file:\n"+move_files[i]+"\n");
+		}
+	}
+
+	for(int i=0;i<move_dirs.size();i++) {
+
+		String to = p_to_path.plus_file(move_dirs[i].get_file());
+		Error err = da->rename(move_dirs[i],to);
+		print_line("moving dir "+move_dirs[i]+" to "+to);
+		if (err!=OK) {
+			EditorNode::get_singleton()->add_io_error("Error moving dir:\n"+move_dirs[i]+"\n");
+		}
+	}
+
+	memdelete(da);
+	//rescan everything
+	print_line("call rescan!");
+	_rescan();
+
+}
+
+void ScenesDock::_file_option(int p_option) {
+
+	switch(p_option) {
+
+		case FILE_DEPENDENCIES: {
+
+			int idx = files->get_current();
+			if (idx<0 || idx>=files->get_item_count())
+				break;
+			String path = files->get_item_metadata(idx);
+			deps_editor->edit(path);
+		} break;
+		case FILE_OWNERS: {
+
+			int idx = files->get_current();
+			if (idx<0 || idx>=files->get_item_count())
+				break;
+			String path = files->get_item_metadata(idx);
+			owners_editor->show(path);
+		} break;
+		case FILE_MOVE: {
+
+			move_dirs.clear();;
+			move_files.clear();
+
+			for(int i=0;i<files->get_item_count();i++) {
+
+				String path = files->get_item_metadata(i);
+				if (!files->is_selected(i))
+					continue;
+
+				 if (files->get_item_text(i)=="..") {
+					 EditorNode::get_singleton()->show_warning("Can't operate on '..'");
+					 return;
+				 }
+
+				if (path.ends_with("/")) {
+					move_dirs.push_back(path.substr(0,path.length()-1));
+				} else {
+					move_files.push_back(path);
+				}
+			}
+
+
+			if (move_dirs.empty() && move_files.size()==1) {
+
+				rename_dialog->clear_filters();
+				rename_dialog->add_filter("*."+move_files[0].extension());
+				rename_dialog->set_mode(EditorFileDialog::MODE_SAVE_FILE);
+				rename_dialog->set_current_path(move_files[0]);
+				rename_dialog->popup_centered_ratio();
+				rename_dialog->set_title("Pick New Name and Location For: "+move_files[0].get_file());
+
+
+			} else {
+				//just move
+				move_dialog->popup_centered_ratio();
+			}
+
+
+		} break;
+		case FILE_REMOVE: {
+
+			Vector<String> torem;
+
+			for(int i=0;i<files->get_item_count();i++) {
+
+				String path = files->get_item_metadata(i);
+				if (path.ends_with("/") || !files->is_selected(i))
+					continue;
+				torem.push_back(path);
+			}
+
+			if (torem.empty()) {
+				EditorNode::get_singleton()->show_warning("No files selected!");
+				break;
+			}
+
+			remove_dialog->show(torem);
+			//1) find if used
+			//2) warn
+
+		} break;
+		case FILE_INFO: {
+
+		} break;
+
+	}
 }
 
-void ScenesDock::_save_favorites() {
+void ScenesDock::_open_pressed(){
+
+
+	if (tree_mode) {
+
+		TreeItem *sel = tree->get_selected();
+		if (!sel) {
+			return;
+		}
+		path = sel->get_metadata(0);
+		/*if (path!="res://" && path.ends_with("/")) {
+			path=path.substr(0,path.length()-1);
+		}*/
+
+		tree_mode=false;
+
+		tree->hide();
+		files->show();
+		path_hb->show();
+		button_favorite->hide();
+		button_fav_up->hide();
+		button_fav_down->hide();
+		button_instance->show();
+		button_open->show();
+		file_options->show();
+
+		_update_files(false);
 
-	String path = Globals::get_singleton()->get_resource_path()+"/favorites.cfg";
-	FileAccess *f=FileAccess::open(path,FileAccess::WRITE);
-	ERR_FAIL_COND(!f);
-	for(Set<String>::Element *E=favorites.front();E;E=E->next() ) {
+		current_path->set_text(path);
 
-		CharString utf8f = E->get().utf8();
-		f->store_buffer((const uint8_t*)utf8f.get_data(),utf8f.length());
-		f->store_8('\n');
+		_push_to_history();
+
+
+	} else {
+
+		int idx=-1;
+		for(int i=0;i<files->get_item_count();i++) {
+			if (files->is_selected(i)) {
+				idx=i;
+				break;
+			}
+		}
+
+		if (idx<0)
+			return;
+
+
+
+		String path = files->get_item_metadata(idx);
+
+		if (path.ends_with("/")) {
+			if (path!="res://") {
+				path=path.substr(0,path.length()-1);
+			}
+			this->path=path;
+			_update_files(false);
+			current_path->set_text(path);
+			_push_to_history();
+		} else {
+
+			if (ResourceLoader::get_resource_type(path)=="PackedScene") {
+
+				editor->open_request(path);
+			} else {
+
+				editor->load_resource(path);
+			}
+		}
 	}
 
-	f->close();
-	memdelete(f);
+//	emit_signal("open",path);
+
 }
 
+
 void ScenesDock::_rescan() {
 
+	_set_scannig_mode();
 	EditorFileSystem::get_singleton()->scan();
+
+}
+
+void ScenesDock::fix_dependencies(const String& p_for_file) {
+	deps_editor->edit(p_for_file);
+}
+
+void ScenesDock::open(const String& p_path) {
+
+
+	String npath;
+	String nfile;
+
+	if (p_path.ends_with("/")) {
+
+		if (p_path!="res://")
+			npath=p_path.substr(0,p_path.length()-1);
+		else
+			npath="res://";
+	} else {
+		nfile=p_path.get_file();
+		npath=p_path.get_base_dir();
+	}
+
+	path=npath;
+
+	if (tree_mode && nfile=="") {
+		_update_tree();
+		tree->grab_focus();
+		tree->call_deferred("ensure_cursor_is_visible");
+		_push_to_history();
+		return;
+	} else if (tree_mode){
+		_update_tree();
+		tree->grab_focus();
+		tree->ensure_cursor_is_visible();
+		_open_pressed();
+		current_path->set_text(path);
+	} else {
+		_update_files(false);
+		_push_to_history();
+	}
+
+	for(int i=0;i<files->get_item_count();i++) {
+
+		String md = files->get_item_metadata(i);
+		if (md==p_path) {
+			files->select(i,true);
+			files->ensure_current_is_visible();
+			break;
+		}
+	}
+
 }
 
 void ScenesDock::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("_update_tree"),&ScenesDock::_update_tree);
 	ObjectTypeDB::bind_method(_MD("_rescan"),&ScenesDock::_rescan);
-	ObjectTypeDB::bind_method(_MD("_favorites_toggled"),&ScenesDock::_favorites_toggled);
-	ObjectTypeDB::bind_method(_MD("_favorite_toggled"),&ScenesDock::_favorite_toggled);
+	ObjectTypeDB::bind_method(_MD("_favorites_pressed"),&ScenesDock::_favorites_pressed);
 	ObjectTypeDB::bind_method(_MD("_instance_pressed"),&ScenesDock::_instance_pressed);
 	ObjectTypeDB::bind_method(_MD("_open_pressed"),&ScenesDock::_open_pressed);
-	ObjectTypeDB::bind_method(_MD("_save_favorites"),&ScenesDock::_save_favorites);
+
+	ObjectTypeDB::bind_method(_MD("_thumbnail_done"),&ScenesDock::_thumbnail_done);
+	ObjectTypeDB::bind_method(_MD("_select_file"), &ScenesDock::_select_file);
+	ObjectTypeDB::bind_method(_MD("_go_to_tree"), &ScenesDock::_go_to_tree);
+	ObjectTypeDB::bind_method(_MD("_go_to_dir"), &ScenesDock::_go_to_dir);
+	ObjectTypeDB::bind_method(_MD("_change_file_display"), &ScenesDock::_change_file_display);
+	ObjectTypeDB::bind_method(_MD("_fw_history"), &ScenesDock::_fw_history);
+	ObjectTypeDB::bind_method(_MD("_bw_history"), &ScenesDock::_bw_history);
+	ObjectTypeDB::bind_method(_MD("_fs_changed"), &ScenesDock::_fs_changed);
+	ObjectTypeDB::bind_method(_MD("_dir_selected"), &ScenesDock::_dir_selected);
+	ObjectTypeDB::bind_method(_MD("_fav_up_pressed"), &ScenesDock::_fav_up_pressed);
+	ObjectTypeDB::bind_method(_MD("_fav_down_pressed"), &ScenesDock::_fav_down_pressed);
+	ObjectTypeDB::bind_method(_MD("_file_option"), &ScenesDock::_file_option);
+	ObjectTypeDB::bind_method(_MD("_move_operation"), &ScenesDock::_move_operation);
+	ObjectTypeDB::bind_method(_MD("_rename_operation"), &ScenesDock::_rename_operation);
 
 	ADD_SIGNAL(MethodInfo("instance"));
 	ADD_SIGNAL(MethodInfo("open"));
@@ -271,153 +1078,156 @@ ScenesDock::ScenesDock(EditorNode *p_editor) {
 	HBoxContainer *toolbar_hbc = memnew( HBoxContainer );
 	add_child(toolbar_hbc);
 
+	button_hist_prev = memnew( ToolButton );
+	toolbar_hbc->add_child(button_hist_prev);
+	button_hist_prev->set_disabled(true);
+	button_hist_prev->set_tooltip("Previous Directory");
+
+	button_hist_next = memnew( ToolButton );
+	toolbar_hbc->add_child(button_hist_next);
+	button_hist_next->set_disabled(true);
+	button_hist_prev->set_focus_mode(FOCUS_NONE);
+	button_hist_next->set_focus_mode(FOCUS_NONE);
+	button_hist_next->set_tooltip("Next Directory");
+
 	button_reload = memnew( Button );
 	button_reload->set_flat(true);
 	button_reload->connect("pressed",this,"_rescan");	
 	toolbar_hbc->add_child(button_reload);
+	button_reload->set_focus_mode(FOCUS_NONE);
+	button_reload->set_tooltip("Re-Scan Filesystem");
+
+	toolbar_hbc->add_spacer();
+
+	button_fav_up = memnew( ToolButton );
+	button_fav_up->set_flat(true);
+	toolbar_hbc->add_child(button_fav_up);
+	button_fav_up->set_disabled(true);
+	button_fav_up->connect("pressed",this,"_fav_up_pressed");
+	button_fav_up->set_tooltip("Move Favorite Up");
+
+	button_fav_down = memnew( ToolButton );
+	button_fav_down->set_flat(true);
+	toolbar_hbc->add_child(button_fav_down);
+	button_fav_down->set_disabled(true);
+	button_fav_down->connect("pressed",this,"_fav_down_pressed");
+	button_fav_down->set_tooltip("Move Favorite Down");
 
 	button_favorite = memnew( Button );
 	button_favorite->set_flat(true);
 	button_favorite->set_toggle_mode(true);
-	button_favorite->connect("toggled",this,"_favorites_toggled");
+	button_favorite->connect("pressed",this,"_favorites_pressed");
 	toolbar_hbc->add_child(button_favorite);
+	button_favorite->set_tooltip("Toggle folder status as Favorite");
+
+	button_favorite->set_focus_mode(FOCUS_NONE);
+	button_fav_up->set_focus_mode(FOCUS_NONE);
+	button_fav_down->set_focus_mode(FOCUS_NONE);
 
-	toolbar_hbc->add_spacer();
 
 	button_open = memnew( Button );
 	button_open->set_flat(true);
 	button_open->connect("pressed",this,"_open_pressed");
 	toolbar_hbc->add_child(button_open);
+	button_open->hide();
+	button_open->set_focus_mode(FOCUS_NONE);
+	button_open->set_tooltip("Open the selected file.\nOpen as scene if a scene, or as resource otherwise.");
+
 
 	button_instance = memnew( Button );
 	button_instance->set_flat(true);
 	button_instance->connect("pressed",this,"_instance_pressed");
 	toolbar_hbc->add_child(button_instance);
+	button_instance->hide();
+	button_instance->set_focus_mode(FOCUS_NONE);
+	button_instance->set_tooltip("Instance the selected scene(s) as child of the selected node.");
+
+
+	file_options = memnew( MenuButton );
+	toolbar_hbc->add_child(file_options);
+	file_options->get_popup()->add_item("Rename or Move",FILE_MOVE);
+	file_options->get_popup()->add_item("Delete",FILE_REMOVE);
+	file_options->get_popup()->add_separator();
+	file_options->get_popup()->add_item("Edit Dependencies",FILE_DEPENDENCIES);
+	file_options->get_popup()->add_item("View Owners",FILE_OWNERS);
+	//file_options->get_popup()->add_item("Info",FILE_INFO);
+	file_options->hide();
+	file_options->set_focus_mode(FOCUS_NONE);
+	file_options->set_tooltip("Miscenaneous options related to resources on disk.");
 
 	tree = memnew( Tree );
-	tree_filter=memnew( ScenesDockFilter() );
-	tree_filter->connect("filter_changed", this, "_update_tree");
-	add_child(tree_filter);
+
+	tree->set_hide_root(true);
 	add_child(tree);
 
+
 	tree->set_v_size_flags(SIZE_EXPAND_FILL);
 	tree->connect("item_edited",this,"_favorite_toggled");
 	tree->connect("item_activated",this,"_open_pressed");
-
-	timer = memnew( Timer );
-	timer->set_one_shot(true);
-	timer->set_wait_time(2);
-	timer->connect("timeout",this,"_save_favorites");
-	add_child(timer);
-
+	tree->connect("cell_selected",this,"_dir_selected");
+
+	files = memnew( ItemList );
+	files->set_v_size_flags(SIZE_EXPAND_FILL);
+	files->set_select_mode(ItemList::SELECT_MULTI);
+
+	path_hb = memnew( HBoxContainer );
+	button_back  = memnew( ToolButton );
+	path_hb->add_child(button_back);
+	current_path=memnew( LineEdit );
+	current_path->set_h_size_flags(SIZE_EXPAND_FILL);
+	path_hb->add_child(current_path);
+	display_mode = memnew( ToolButton );
+	path_hb->add_child(display_mode);
+	display_mode->set_toggle_mode(true);
+	add_child(path_hb);
+	path_hb->hide();
+
+
+	add_child(files);
+	files->hide();
+
+	scanning_vb = memnew( VBoxContainer );
+	Label *slabel = memnew( Label );
+	slabel->set_text("Scanning Files,\nPlease Wait..");
+	slabel->set_align(Label::ALIGN_CENTER);
+	scanning_vb->add_child(slabel);
+	scanning_progress = memnew( ProgressBar );
+	scanning_vb->add_child(scanning_progress);
+	add_child(scanning_vb);
+	scanning_vb->hide();
+
+
+
+	deps_editor = memnew( DependencyEditor );
+	add_child(deps_editor);
+
+	owners_editor = memnew( DependencyEditorOwners);
+	add_child(owners_editor);
+
+	remove_dialog = memnew( DependencyRemoveDialog);
+	add_child(remove_dialog);
+
+	move_dialog = memnew( EditorDirDialog );
+	add_child(move_dialog);	
+	move_dialog->connect("dir_selected",this,"_move_operation");
+	move_dialog->get_ok()->set_text("Move");
+	
+	rename_dialog = memnew( EditorFileDialog );
+	rename_dialog->set_mode(EditorFileDialog::MODE_SAVE_FILE);
+	rename_dialog->connect("file_selected",this,"_rename_operation");
+	add_child(rename_dialog);
 
 	updating_tree=false;
+	initialized=false;
 
-}
-
-ScenesDock::~ScenesDock() {
-
-}
-
-void ScenesDockFilter::_setup_filters() {
-
-	filter_option->clear();
-	filter_option->add_item("Path");
-	filter_option->add_item("Name");
-	filter_option->add_item("Folder");
-#if 0
-	List<String> extensions;
-	ResourceLoader::get_recognized_extensions_for_type("",&extensions);
-
-	file_filter->add_item("All Files (*)");
-	filters.push_back("*");
-
-	List<String> filter_texts;
-	for(int i=0;i<extensions.size();i++) {
-		filter_texts.push_back("*."+extensions[i]+" ; "+extensions[i].to_upper());
-		filters.push_back(extensions[i]);
-	}
-	for(int i=0;i<filter_texts.size();i++) {
-
-		String flt=filter_texts[i].get_slice(";",0).strip_edges();
-		String desc=filter_texts[i].get_slice(";",1).strip_edges();
-		if (desc.length())
-			file_filter->add_item(desc+" ( "+flt+" )");
-		else
-			file_filter->add_item("( "+flt+" )");
-	}
-#endif
-}
-
-void ScenesDockFilter::_command(int p_command) {
-	switch (p_command) {
-
-		case CMD_CLEAR_FILTER: {
-			if (search_box->get_text()!="") {
-				search_box->clear();
-				emit_signal("filter_changed");
-			}
-		}break;
-	}
-}
-
-void ScenesDockFilter::_search_text_changed(const String &p_newtext) {
-	emit_signal("filter_changed");
-}
-
-String ScenesDockFilter::get_search_term() {
-	return search_box->get_text().strip_edges();
-}
-
-ScenesDockFilter::FilterOption ScenesDockFilter::get_file_filter() {
-	return _current_filter;
-}
-
-void ScenesDockFilter::_file_filter_selected(int p_idx) {
-	FilterOption selected = (FilterOption)(filter_option->get_selected());
-	if (_current_filter != selected ) {
-		_current_filter = selected;
-		emit_signal("filter_changed");
-	}
-}
-
-void ScenesDockFilter::_notification(int p_what) {
-	switch(p_what) {
-		case NOTIFICATION_ENTER_TREE: {
-			clear_search_button->set_icon(get_icon("CloseHover","EditorIcons"));
-		} break;
-	}
-}
-
-void ScenesDockFilter::_bind_methods() {
+	history.push_back("res://");
+	history_pos=0;
+	tree_mode=true;
 
-	ObjectTypeDB::bind_method(_MD("_command"),&ScenesDockFilter::_command);
-	ObjectTypeDB::bind_method(_MD("_search_text_changed"), &ScenesDockFilter::_search_text_changed);
-	ObjectTypeDB::bind_method(_MD("_file_filter_selected"), &ScenesDockFilter::_file_filter_selected);
 
-	ADD_SIGNAL( MethodInfo("filter_changed") );
 }
 
-ScenesDockFilter::ScenesDockFilter() {
-
-	_current_filter = FILTER_PATH;
-
-	filter_option = memnew( OptionButton );
-	filter_option->set_custom_minimum_size(Size2(60,10));
-	filter_option->set_clip_text(true);
-	filter_option->connect("item_selected", this, "_file_filter_selected");
-	add_child(filter_option);
-
-	_setup_filters();
-
-	search_box = memnew( LineEdit );
-	search_box->connect("text_changed",this,"_search_text_changed");
-	search_box->set_h_size_flags(SIZE_EXPAND_FILL);
-	add_child(search_box);
-
-	clear_search_button = memnew( ToolButton );
-	clear_search_button->connect("pressed",this,"_command",make_binds(CMD_CLEAR_FILTER));
-	add_child(clear_search_button);
+ScenesDock::~ScenesDock() {
 
 }
 
diff --git a/tools/editor/scenes_dock.h b/tools/editor/scenes_dock.h
index de7ab51edc..d045124bf7 100644
--- a/tools/editor/scenes_dock.h
+++ b/tools/editor/scenes_dock.h
@@ -36,40 +36,112 @@
 #include "scene/gui/tool_button.h"
 #include "scene/gui/option_button.h"
 #include "scene/gui/box_container.h"
+#include "scene/gui/menu_button.h"
+#include "scene/gui/item_list.h"
+#include "scene/gui/progress_bar.h"
+
 #include "os/dir_access.h"
 #include "os/thread.h"
 
 #include "editor_file_system.h"
-
+#include "editor_dir_dialog.h"
+#include "dependency_editor.h"
 
 class EditorNode;
 
-class ScenesDockFilter;
+
 class ScenesDock : public VBoxContainer {
 	OBJ_TYPE( ScenesDock, VBoxContainer );
 
+	enum FileMenu {
+		FILE_DEPENDENCIES,
+		FILE_OWNERS,
+		FILE_MOVE,
+		FILE_REMOVE,
+		FILE_REIMPORT,
+		FILE_INFO
+	};
+
+
+	VBoxContainer *scanning_vb;
+	ProgressBar *scanning_progress;
+
 	EditorNode *editor;
 	Set<String> favorites;
 
 	Button *button_reload;
 	Button *button_instance;
 	Button *button_favorite;
+	Button *button_fav_up;
+	Button *button_fav_down;
 	Button *button_open;
-	Timer *timer;
+	Button *button_back;
+	Button *display_mode;
+	Button *button_hist_next;
+	Button *button_hist_prev;
+	LineEdit *current_path;
+	HBoxContainer *path_hb;
+
+	MenuButton *file_options;
+
+
+	DependencyEditor *deps_editor;
+	DependencyEditorOwners *owners_editor;
+	DependencyRemoveDialog *remove_dialog;
+
+	EditorDirDialog *move_dialog;
+	EditorFileDialog *rename_dialog;
 
-	ScenesDockFilter *tree_filter;
+	Vector<String> move_dirs;
+	Vector<String> move_files;
+
+
+	Vector<String> history;
+	int history_pos;
+
+	String path;
+
+	bool initialized;
 
 	bool updating_tree;
-	Tree * tree;
+	Tree * tree; //directories
+	ItemList *files;
+
+	bool tree_mode;
+
+	void _go_to_tree();
+	void _go_to_dir(const String& p_dir);
+	void _select_file(int p_idx);
+
 	bool _create_tree(TreeItem *p_parent,EditorFileSystemDirectory *p_dir);
+	void _thumbnail_done(const String& p_path,const Ref<Texture>& p_preview, const Variant& p_udata);
+	void _find_inside_move_files(EditorFileSystemDirectory *efsd,Vector<String>& files);
+	void _find_remaps(EditorFileSystemDirectory *efsd,Map<String,String> &renames,List<String>& to_remaps);
+
+	void _rename_operation(const String& p_to_path);
+	void _move_operation(const String& p_to_path);
+
+
+	void _file_option(int p_option);
+	void _update_files(bool p_keep_selection);
+	void _change_file_display();
 
+	void _fs_changed();
+	void _fw_history();
+	void _bw_history();
+	void _push_to_history();
+
+	void _fav_up_pressed();
+	void _fav_down_pressed();
+	void _dir_selected();
 	void _update_tree();
 	void _rescan();
-	void _favorites_toggled(bool);
-	void _favorite_toggled();
+	void _set_scannig_mode();
+
+	void _favorites_pressed();	
 	void _instance_pressed();
 	void _open_pressed();
-	void _save_favorites();
+
 
 protected:
 	void _notification(int p_what);
@@ -77,48 +149,14 @@ protected:
 public:
 
 	String get_selected_path() const;
+	void open(const String& p_path);
+
+	void fix_dependencies(const String& p_for_file);
+
 
 	ScenesDock(EditorNode *p_editor);
 	~ScenesDock();
 };
 
-class ScenesDockFilter : public HBoxContainer {
-
-	OBJ_TYPE( ScenesDockFilter, HBoxContainer );
-
-private:
-	friend class ScenesDock;
-
-	enum Command {
-		CMD_CLEAR_FILTER,
-	};
-
-	Tree *tree;
-	OptionButton *filter_option;
-	LineEdit *search_box;
-	ToolButton *clear_search_button;
-
-	enum FilterOption {
-		FILTER_PATH, // NAME or Folder
-		FILTER_NAME,
-		FILTER_FOLDER,
-	};
-	FilterOption _current_filter;
-	//Vector<String> filters;
-
-	void _command(int p_command);
-	void _search_text_changed(const String& p_newtext);
-	void _setup_filters();
-	void _file_filter_selected(int p_idx);
-
-protected:
-	void _notification(int p_what);
-	static void _bind_methods();
-
-public:
-	String get_search_term();
-	FilterOption get_file_filter();
-	ScenesDockFilter();
-};
 
 #endif // SCENES_DOCK_H
diff --git a/tools/editor/script_create_dialog.cpp b/tools/editor/script_create_dialog.cpp
index bdfb66f0f2..622150ab68 100644
--- a/tools/editor/script_create_dialog.cpp
+++ b/tools/editor/script_create_dialog.cpp
@@ -74,17 +74,17 @@ bool ScriptCreateDialog::_validate(const String& p_string) {
 void ScriptCreateDialog::_class_name_changed(const String& p_name) {
 
 	if (!_validate(parent_name->get_text())) {
-		error_label->set_text("INVALID PARENT CLASS NAME");
+		error_label->set_text("Invaild parent class name");
 		error_label->add_color_override("font_color",Color(1,0.4,0.0,0.8));
 	} else if (class_name->is_editable()) {
 		if (class_name->get_text()=="") {
 		error_label->set_text("Valid Chars: a-z A-Z 0-9 _");
 		error_label->add_color_override("font_color",Color(1,1,1,0.6));
 		} else if (!_validate(class_name->get_text())) {
-			error_label->set_text("INVALID CLASS NAME");
+			error_label->set_text("Invalid class name");
 			error_label->add_color_override("font_color",Color(1,0.2,0.2,0.8));
 		} else {
-			error_label->set_text("Name is Valid");
+			error_label->set_text("Valid Name");
 			error_label->add_color_override("font_color",Color(0,1.0,0.8,0.8));
 		}
 	} else {
@@ -363,7 +363,7 @@ ScriptCreateDialog::ScriptCreateDialog() {
 
 	set_size(Size2(200,150));
 	set_hide_on_ok(false);
-	set_title("Create Script for Node..");;
+	set_title("Create Script for Node");
 
 	file_browse = memnew( EditorFileDialog );
 	file_browse->connect("file_selected",this,"_file_selected");
diff --git a/tools/editor/script_editor_debugger.cpp b/tools/editor/script_editor_debugger.cpp
index 13734f2c4b..8e0e7ddb49 100644
--- a/tools/editor/script_editor_debugger.cpp
+++ b/tools/editor/script_editor_debugger.cpp
@@ -169,6 +169,17 @@ void ScriptEditorDebugger::_scene_tree_request() {
 
 }
 
+void ScriptEditorDebugger::_video_mem_request() {
+
+	ERR_FAIL_COND(connection.is_null());
+	ERR_FAIL_COND(!connection->is_connected());
+
+	Array msg;
+	msg.push_back("request_video_mem");
+	ppeer->put_var(msg);
+
+}
+
 Size2 ScriptEditorDebugger::get_minimum_size() const {
 
 	Size2 ms = Control::get_minimum_size();
@@ -241,6 +252,33 @@ void ScriptEditorDebugger::_parse_message(const String& p_msg,const Array& p_dat
 			lv[level]=it;
 		}
 
+		le_clear->set_disabled(false);
+		le_set->set_disabled(false);
+
+	} else if (p_msg=="message:video_mem") {
+
+		vmem_tree->clear();
+		TreeItem* root=vmem_tree->create_item();
+
+		int total=0;
+
+		for(int i=0;i<p_data.size();i+=4) {
+
+			TreeItem *it = vmem_tree->create_item(root);
+			String type=p_data[i+1];
+			int bytes=p_data[i+3].operator int();
+			it->set_text(0,p_data[i+0]); //path
+			it->set_text(1,type); //type
+			it->set_text(2,p_data[i+2]); //type
+			it->set_text(3,String::humanize_size(bytes)); //type
+			total+=bytes;
+
+			if (has_icon(type,"EditorIcons"))
+				it->set_icon(0,get_icon(type,"EditorIcons"));
+		}
+
+		vmem_total->set_tooltip("Bytes: "+itos(total));
+		vmem_total->set_text(String::humanize_size(total));
 
 	} else if (p_msg=="stack_dump") {
 
@@ -342,6 +380,63 @@ void ScriptEditorDebugger::_parse_message(const String& p_msg,const Array& p_dat
 		perf_history.push_front(p);
 		perf_draw->update();
 
+	} else if (p_msg=="error") {
+
+		Array err = p_data[0];
+
+		Array vals;
+		vals.push_back(err[0]);
+		vals.push_back(err[1]);
+		vals.push_back(err[2]);
+		vals.push_back(err[3]);
+
+		bool warning = err[9];
+		bool e;
+		String time = String("%d:%02d:%02d:%04d").sprintf(vals,&e);
+		String txt=time+" - "+String(err[8]);
+
+		String tooltip="Type:"+String(warning?"Warning":"Error");
+		tooltip+="\nDescription: "+String(err[8]);
+		tooltip+="\nTime: "+time;
+		tooltip+="\nC Error: "+String(err[7]);
+		tooltip+="\nC Source: "+String(err[5])+":"+String(err[6]);
+		tooltip+="\nC Function: "+String(err[4]);
+
+
+
+		error_list->add_item(txt,EditorNode::get_singleton()->get_gui_base()->get_icon(warning?"Warning":"Error","EditorIcons"));
+		error_list->set_item_tooltip( error_list->get_item_count() -1,tooltip );
+
+		int scc = p_data[1];
+
+		Array stack;
+		stack.resize(scc);
+		for(int i=0;i<scc;i++) {
+			stack[i]=p_data[2+i];
+		}
+
+		error_list->set_item_metadata( error_list->get_item_count() -1,stack );
+
+		error_count++;
+		/*
+		int count = p_data[1];
+
+		Array cstack;
+
+		OutputError oe = errors.front()->get();
+
+		packet_peer_stream->put_var(oe.hr);
+		packet_peer_stream->put_var(oe.min);
+		packet_peer_stream->put_var(oe.sec);
+		packet_peer_stream->put_var(oe.msec);
+		packet_peer_stream->put_var(oe.source_func);
+		packet_peer_stream->put_var(oe.source_file);
+		packet_peer_stream->put_var(oe.source_line);
+		packet_peer_stream->put_var(oe.error);
+		packet_peer_stream->put_var(oe.error_descr);
+		packet_peer_stream->put_var(oe.warning);
+		packet_peer_stream->put_var(oe.callstack);
+		*/
 	} else if (p_msg=="kill_me") {
 
 		editor->call_deferred("stop_child_process");
@@ -443,10 +538,24 @@ void ScriptEditorDebugger::_notification(int p_what) {
 			tb->set_hover_texture( get_icon("CloseHover","EditorIcons"));
 			tb->set_pressed_texture( get_icon("Close","EditorIcons"));
 			scene_tree_refresh->set_icon( get_icon("Reload","EditorIcons"));
+			le_set->connect("pressed",this,"_live_edit_set");
+			le_clear->connect("pressed",this,"_live_edit_clear");
+			error_list->connect("item_selected",this,"_error_selected");
+			error_stack->connect("item_selected",this,"_error_stack_selected");
+			vmem_refresh->set_icon( get_icon("Reload","EditorIcons"));
 
 		} break;
 		case NOTIFICATION_PROCESS: {
 
+			if (error_count!=last_error_count) {
+
+				if (error_count==0) {
+					error_split->set_name("Errors");
+				} else {
+					error_split->set_name("Errors ("+itos(error_count)+")");
+				}
+				last_error_count=error_count;
+			}
 			if (connection.is_null()) {
 
 				if (server->is_connection_available()) {
@@ -468,6 +577,15 @@ void ScriptEditorDebugger::_notification(int p_what) {
 					emit_signal("show_debugger",true);
 					reason->set_text("Child Process Connected");
 					reason->set_tooltip("Child Process Connected");
+					scene_tree->clear();
+					le_set->set_disabled(true);
+					le_clear->set_disabled(false);
+					error_list->clear();
+					error_stack->clear();
+					error_count=0;
+					//live_edit_root->set_text("/root");
+
+					update_live_edit_root();
 
 				} else {
 
@@ -613,6 +731,10 @@ void ScriptEditorDebugger::stop(){
 		log_forced_visible=false;
 	}
 
+	node_path_cache.clear();
+	res_path_cache.clear();
+	le_clear->set_disabled(false);
+	le_set->set_disabled(true);
 
 
 	hide();
@@ -664,6 +786,381 @@ String ScriptEditorDebugger::get_var_value(const String& p_var) const {
 	return variables->get_var_value(p_var);
 }
 
+int ScriptEditorDebugger::_get_node_path_cache(const NodePath& p_path) {
+
+	const int *r = node_path_cache.getptr(p_path);
+	if (r)
+		return *r;
+
+	last_path_id++;
+
+	node_path_cache[p_path]=last_path_id;
+	Array msg;
+	msg.push_back("live_node_path");
+	msg.push_back(p_path);
+	msg.push_back(last_path_id);
+	ppeer->put_var(msg);
+
+
+	return last_path_id;
+}
+
+int ScriptEditorDebugger::_get_res_path_cache(const String& p_path) {
+
+	Map<String,int>::Element *E=res_path_cache.find(p_path);
+
+	if (E)
+		return E->get();
+
+	last_path_id++;
+
+	res_path_cache[p_path]=last_path_id;
+	Array msg;
+	msg.push_back("live_res_path");
+	msg.push_back(p_path);
+	msg.push_back(last_path_id);
+	ppeer->put_var(msg);
+
+
+	return last_path_id;
+}
+
+void ScriptEditorDebugger::_method_changed(Object*p_base,const StringName& p_name,VARIANT_ARG_DECLARE) {
+
+	if (!p_base || !live_debug || !connection.is_valid() || !editor->get_edited_scene())
+		return;
+
+	Node *node = p_base->cast_to<Node>();
+
+	VARIANT_ARGPTRS
+
+	for(int i=0;i<VARIANT_ARG_MAX;i++) {
+		//no pointers, sorry
+		if (argptr[i] && (argptr[i]->get_type()==Variant::OBJECT || argptr[i]->get_type()==Variant::_RID))
+			return;
+	}
+
+	if (node) {
+
+		NodePath path = editor->get_edited_scene()->get_path_to(node);
+		int pathid = _get_node_path_cache(path);
+
+
+
+		Array msg;
+		msg.push_back("live_node_call");
+		msg.push_back(pathid);
+		msg.push_back(p_name);
+		for(int i=0;i<VARIANT_ARG_MAX;i++) {
+			//no pointers, sorry
+			msg.push_back(*argptr[i]);
+		}
+		ppeer->put_var(msg);
+
+		return;
+
+	}
+
+	Resource *res = p_base->cast_to<Resource>();
+
+	if (res && res->get_path()!=String()) {
+
+		String respath = res->get_path();
+		int pathid = _get_res_path_cache(respath);
+
+		Array msg;
+		msg.push_back("live_res_call");
+		msg.push_back(pathid);
+		msg.push_back(p_name);
+		for(int i=0;i<VARIANT_ARG_MAX;i++) {
+			//no pointers, sorry
+			msg.push_back(*argptr[i]);
+		}
+		ppeer->put_var(msg);
+
+		return;
+	}
+
+	//print_line("method");
+}
+
+void ScriptEditorDebugger::_property_changed(Object*p_base,const StringName& p_property,const Variant& p_value){
+
+	if (!p_base || !live_debug || !connection.is_valid() || !editor->get_edited_scene())
+		return;
+
+	Node *node = p_base->cast_to<Node>();
+
+	if (node) {
+
+		NodePath path = editor->get_edited_scene()->get_path_to(node);
+		int pathid = _get_node_path_cache(path);
+
+
+		if (p_value.is_ref()) {
+			Ref<Resource> res = p_value;
+			if (res.is_valid() && res->get_path()!=String()) {
+
+				Array msg;
+				msg.push_back("live_node_prop_res");
+				msg.push_back(pathid);
+				msg.push_back(p_property);
+				msg.push_back(res->get_path());
+				ppeer->put_var(msg);
+			}
+		} else {
+
+			Array msg;
+			msg.push_back("live_node_prop");
+			msg.push_back(pathid);
+			msg.push_back(p_property);
+			msg.push_back(p_value);
+			ppeer->put_var(msg);
+		}
+
+
+		return;
+
+	}
+
+	Resource *res = p_base->cast_to<Resource>();
+
+	if (res && res->get_path()!=String()) {
+
+		String respath = res->get_path();
+		int pathid = _get_res_path_cache(respath);
+
+
+		if (p_value.is_ref()) {
+			Ref<Resource> res = p_value;
+			if (res.is_valid() && res->get_path()!=String()) {
+
+				Array msg;
+				msg.push_back("live_res_prop_res");
+				msg.push_back(pathid);
+				msg.push_back(p_property);
+				msg.push_back(res->get_path());
+				ppeer->put_var(msg);
+			}
+		} else {
+
+			Array msg;
+			msg.push_back("live_res_prop");
+			msg.push_back(pathid);
+			msg.push_back(p_property);
+			msg.push_back(p_value);
+			ppeer->put_var(msg);
+		}
+
+
+		return;
+	}
+
+
+	//print_line("prop");
+}
+
+void ScriptEditorDebugger::_method_changeds(void *p_ud,Object*p_base,const StringName& p_name,VARIANT_ARG_DECLARE) {
+
+	ScriptEditorDebugger *sed = (ScriptEditorDebugger*)p_ud;
+	sed->_method_changed(p_base,p_name,VARIANT_ARG_PASS);
+
+
+}
+
+void ScriptEditorDebugger::_property_changeds(void *p_ud,Object*p_base,const StringName& p_property,const Variant& p_value){
+
+	ScriptEditorDebugger *sed = (ScriptEditorDebugger*)p_ud;
+	sed->_property_changed(p_base,p_property,p_value);
+
+}
+
+void ScriptEditorDebugger::set_live_debugging(bool p_enable) {
+
+	live_debug=p_enable;
+}
+
+void ScriptEditorDebugger::_live_edit_set() {
+
+	if (!connection.is_valid())
+		return;
+
+	TreeItem* ti = scene_tree->get_selected();
+	if (!ti)
+		return;
+	String path;
+
+	while(ti) {
+		String lp=ti->get_text(0);
+		path="/"+lp+path;
+		ti=ti->get_parent();
+
+	}
+
+	NodePath np = path;
+
+	editor->get_editor_data().set_edited_scene_live_edit_root(np);
+
+	update_live_edit_root();
+
+
+}
+
+void ScriptEditorDebugger::_live_edit_clear() {
+
+	NodePath np = NodePath("/root");
+	editor->get_editor_data().set_edited_scene_live_edit_root(np);
+
+	update_live_edit_root();
+
+}
+
+void ScriptEditorDebugger::update_live_edit_root() {
+
+	NodePath np = editor->get_editor_data().get_edited_scene_live_edit_root();
+
+	if (connection.is_valid()) {
+		Array msg;
+		msg.push_back("live_set_root");
+		msg.push_back(np);
+		if (editor->get_edited_scene())
+			msg.push_back(editor->get_edited_scene()->get_filename());
+		else
+			msg.push_back("");
+		ppeer->put_var(msg);
+	}
+	live_edit_root->set_text(np);
+
+}
+
+void ScriptEditorDebugger::live_debug_create_node(const NodePath& p_parent,const String& p_type,const String& p_name) {
+
+	if (live_debug && connection.is_valid()) {
+		Array msg;
+		msg.push_back("live_create_node");
+		msg.push_back(p_parent);
+		msg.push_back(p_type);
+		msg.push_back(p_name);
+		ppeer->put_var(msg);
+	}
+}
+
+void ScriptEditorDebugger::live_debug_instance_node(const NodePath& p_parent,const String& p_path,const String& p_name){
+
+	if (live_debug && connection.is_valid()) {
+		Array msg;
+		msg.push_back("live_instance_node");
+		msg.push_back(p_parent);
+		msg.push_back(p_path);
+		msg.push_back(p_name);
+		ppeer->put_var(msg);
+	}
+
+}
+void ScriptEditorDebugger::live_debug_remove_node(const NodePath& p_at){
+
+	if (live_debug && connection.is_valid()) {
+		Array msg;
+		msg.push_back("live_remove_node");
+		msg.push_back(p_at);
+		ppeer->put_var(msg);
+	}
+
+}
+void ScriptEditorDebugger::live_debug_remove_and_keep_node(const NodePath& p_at,ObjectID p_keep_id) {
+
+	if (live_debug && connection.is_valid()) {
+		Array msg;
+		msg.push_back("live_remove_and_keep_node");
+		msg.push_back(p_at);
+		msg.push_back(p_keep_id);
+		ppeer->put_var(msg);
+	}
+
+}
+void ScriptEditorDebugger::live_debug_restore_node(ObjectID p_id, const NodePath& p_at, int p_at_pos){
+
+	if (live_debug && connection.is_valid()) {
+		Array msg;
+		msg.push_back("live_restore_node");
+		msg.push_back(p_id);
+		msg.push_back(p_at);
+		msg.push_back(p_at_pos);
+		ppeer->put_var(msg);
+	}
+
+}
+void ScriptEditorDebugger::live_debug_duplicate_node(const NodePath& p_at,const String& p_new_name){
+
+	if (live_debug && connection.is_valid()) {
+		Array msg;
+		msg.push_back("live_duplicate_node");
+		msg.push_back(p_at);
+		msg.push_back(p_new_name);
+		ppeer->put_var(msg);
+	}
+
+}
+void ScriptEditorDebugger::live_debug_reparent_node(const NodePath& p_at, const NodePath& p_new_place, const String &p_new_name, int p_at_pos){
+
+	if (live_debug && connection.is_valid()) {
+		Array msg;
+		msg.push_back("live_reparent_node");
+		msg.push_back(p_at);
+		msg.push_back(p_new_place);
+		msg.push_back(p_new_name);
+		msg.push_back(p_at_pos);
+		ppeer->put_var(msg);
+	}
+
+}
+
+void ScriptEditorDebugger::set_breakpoint(const String& p_path,int p_line,bool p_enabled) {
+
+	if (connection.is_valid()) {
+	       Array msg;
+	       msg.push_back("breakpoint");
+	       msg.push_back(p_path);
+	       msg.push_back(p_line);
+	       msg.push_back(p_enabled);
+	       ppeer->put_var(msg);
+       }
+}
+
+
+void ScriptEditorDebugger::_error_selected(int p_idx) {
+
+	error_stack->clear();
+	Array st=error_list->get_item_metadata(p_idx);
+	for(int i=0;i<st.size();i+=2) {
+
+		String script=st[i];
+		int line=st[i+1];
+		Array md;
+		md.push_back(st[i]);
+		md.push_back(st[i+1]);
+
+		String str = script.get_file()+":"+itos(line);
+
+		error_stack->add_item(str);
+		error_stack->set_item_metadata(error_stack->get_item_count()-1,md);
+		error_stack->set_item_tooltip(error_stack->get_item_count()-1,"File: "+String(st[i])+"\nLine: "+itos(line));
+	}
+}
+
+void ScriptEditorDebugger:: _error_stack_selected(int p_idx){
+
+	Array arr = error_stack->get_item_metadata(p_idx);
+	if (arr.size()!=2)
+		return;
+
+
+	Ref<Script> s = ResourceLoader::load(arr[0]);
+	emit_signal("goto_script_line",s,int(arr[1])-1);
+
+}
+
+
 void ScriptEditorDebugger::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("_stack_dump_frame_selected"),&ScriptEditorDebugger::_stack_dump_frame_selected);
@@ -676,6 +1173,20 @@ void ScriptEditorDebugger::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("_performance_draw"),&ScriptEditorDebugger::_performance_draw);
 	ObjectTypeDB::bind_method(_MD("_performance_select"),&ScriptEditorDebugger::_performance_select);
 	ObjectTypeDB::bind_method(_MD("_scene_tree_request"),&ScriptEditorDebugger::_scene_tree_request);
+	ObjectTypeDB::bind_method(_MD("_video_mem_request"),&ScriptEditorDebugger::_video_mem_request);
+	ObjectTypeDB::bind_method(_MD("_live_edit_set"),&ScriptEditorDebugger::_live_edit_set);
+	ObjectTypeDB::bind_method(_MD("_live_edit_clear"),&ScriptEditorDebugger::_live_edit_clear);
+
+	ObjectTypeDB::bind_method(_MD("_error_selected"),&ScriptEditorDebugger::_error_selected);
+	ObjectTypeDB::bind_method(_MD("_error_stack_selected"),&ScriptEditorDebugger::_error_stack_selected);
+
+	ObjectTypeDB::bind_method(_MD("live_debug_create_node"),&ScriptEditorDebugger::live_debug_create_node);
+	ObjectTypeDB::bind_method(_MD("live_debug_instance_node"),&ScriptEditorDebugger::live_debug_instance_node);
+	ObjectTypeDB::bind_method(_MD("live_debug_remove_node"),&ScriptEditorDebugger::live_debug_remove_node);
+	ObjectTypeDB::bind_method(_MD("live_debug_remove_and_keep_node"),&ScriptEditorDebugger::live_debug_remove_and_keep_node);
+	ObjectTypeDB::bind_method(_MD("live_debug_restore_node"),&ScriptEditorDebugger::live_debug_restore_node);
+	ObjectTypeDB::bind_method(_MD("live_debug_duplicate_node"),&ScriptEditorDebugger::live_debug_duplicate_node);
+	ObjectTypeDB::bind_method(_MD("live_debug_reparent_node"),&ScriptEditorDebugger::live_debug_reparent_node);
 
 	ADD_SIGNAL(MethodInfo("goto_script_line"));
 	ADD_SIGNAL(MethodInfo("breaked",PropertyInfo(Variant::BOOL,"reallydid")));
@@ -789,6 +1300,23 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor){
 	vbc->add_child(hbc);
 
 
+	error_split = memnew( HSplitContainer );
+	VBoxContainer *errvb = memnew( VBoxContainer );
+	errvb->set_h_size_flags(SIZE_EXPAND_FILL);
+	error_list = memnew( ItemList );
+	errvb->add_margin_child("Errors:",error_list,true);
+	error_split->add_child(errvb);
+
+	errvb = memnew( VBoxContainer );
+	errvb->set_h_size_flags(SIZE_EXPAND_FILL);
+	error_stack = memnew( ItemList );
+	errvb->add_margin_child("Stack Trace (if applies):",error_stack,true);
+	error_split->add_child(errvb);
+
+	error_split->set_name("Errors");
+	tabs->add_child(error_split);
+
+
 	HSplitContainer *hsp = memnew( HSplitContainer );
 
 	perf_monitors = memnew(Tree);
@@ -832,6 +1360,48 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor){
 
 	}
 
+	VBoxContainer *vmem_vb = memnew( VBoxContainer );
+	HBoxContainer *vmem_hb = memnew( HBoxContainer );
+	Label *vmlb = memnew(Label("List of Video Memory Usage by Resource: ") );
+	vmlb->set_h_size_flags(SIZE_EXPAND_FILL);
+	vmem_hb->add_child( vmlb );
+	vmem_hb->add_child( memnew(Label("Total: ")) );
+	vmem_total = memnew( LineEdit );
+	vmem_total->set_editable(false);
+	vmem_total->set_custom_minimum_size(Size2(100,1));
+	vmem_hb->add_child(vmem_total);
+	vmem_refresh = memnew( Button );
+	vmem_hb->add_child(vmem_refresh);
+	vmem_vb->add_child(vmem_hb);
+	vmem_refresh->connect("pressed",this,"_video_mem_request");
+
+	MarginContainer *vmmc = memnew( MarginContainer );
+	vmmc = memnew( MarginContainer );
+	vmem_tree = memnew( Tree );
+	vmem_tree->set_v_size_flags(SIZE_EXPAND_FILL);
+	vmem_tree->set_h_size_flags(SIZE_EXPAND_FILL);
+	vmmc->add_child(vmem_tree);
+	vmmc->set_v_size_flags(SIZE_EXPAND_FILL);
+	vmem_vb->add_child(vmmc);
+
+	vmem_vb->set_name("Video Mem");
+	vmem_tree->set_columns(4);
+	vmem_tree->set_column_titles_visible(true);
+	vmem_tree->set_column_title(0,"Resource Path");
+	vmem_tree->set_column_expand(0,true);
+	vmem_tree->set_column_expand(1,false);
+	vmem_tree->set_column_title(1,"Type");
+	vmem_tree->set_column_min_width(1,100);
+	vmem_tree->set_column_expand(2,false);
+	vmem_tree->set_column_title(2,"Format");
+	vmem_tree->set_column_min_width(2,150);
+	vmem_tree->set_column_expand(3,false);
+	vmem_tree->set_column_title(3,"Usage");
+	vmem_tree->set_column_min_width(3,80);
+	vmem_tree->set_hide_root(true);
+
+	tabs->add_child(vmem_vb);
+
 	info = memnew( HSplitContainer );
 	info->set_name("Info");
 	tabs->add_child(info);
@@ -843,6 +1413,26 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor){
 	info_left->add_margin_child("Clicked Control:",clicked_ctrl);
 	clicked_ctrl_type = memnew( LineEdit );
 	info_left->add_margin_child("Clicked Control Type:",clicked_ctrl_type);
+
+	live_edit_root = memnew( LineEdit );
+
+	{
+		HBoxContainer *lehb = memnew( HBoxContainer );
+		Label *l = memnew( Label("Live Edit Root:") );
+		lehb->add_child(l);
+		l->set_h_size_flags(SIZE_EXPAND_FILL);
+		le_set = memnew( Button("Set From Tree") );
+		lehb->add_child(le_set);
+		le_clear = memnew( Button("Clear") );
+		lehb->add_child(le_clear);
+		info_left->add_child(lehb);
+		MarginContainer *mc = memnew( MarginContainer );
+		mc->add_child(live_edit_root);
+		info_left->add_child(mc);
+		le_set->set_disabled(true);
+		le_clear->set_disabled(true);
+	}
+
 	VBoxContainer *info_right = memnew(VBoxContainer);
 	info_right->set_h_size_flags(SIZE_EXPAND_FILL);
 	info->add_child(info_right);
@@ -868,6 +1458,14 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor){
 	hide();
 	log_forced_visible=false;
 
+	p_editor->get_undo_redo()->set_method_notify_callback(_method_changeds,this);
+	p_editor->get_undo_redo()->set_property_notify_callback(_property_changeds,this);
+	live_debug=false;
+	last_path_id=false;
+	error_count=0;
+	last_error_count=0;
+
+
 }
 
 ScriptEditorDebugger::~ScriptEditorDebugger() {
diff --git a/tools/editor/script_editor_debugger.h b/tools/editor/script_editor_debugger.h
index c59cc1cf9d..6b66a62dd5 100644
--- a/tools/editor/script_editor_debugger.h
+++ b/tools/editor/script_editor_debugger.h
@@ -45,6 +45,7 @@ class TextureButton;
 class AcceptDialog;
 class TreeItem;
 class HSplitContainer;
+class ItemList;
 
 class ScriptEditorDebugger : public Control {
 
@@ -56,9 +57,21 @@ class ScriptEditorDebugger : public Control {
 
 	LineEdit *clicked_ctrl;
 	LineEdit *clicked_ctrl_type;
+	LineEdit *live_edit_root;
 	Tree *scene_tree;
 	HSplitContainer *info;
 	Button *scene_tree_refresh;
+	Button *le_set;
+	Button *le_clear;
+
+	HSplitContainer *error_split;
+	ItemList *error_list;
+	ItemList *error_stack;
+
+	int error_count;
+	int last_error_count;
+
+
 
 	TextureButton *tb;
 
@@ -83,6 +96,10 @@ class ScriptEditorDebugger : public Control {
 	Tree *perf_monitors;
 	Control *perf_draw;
 
+	Tree *vmem_tree;
+	Button *vmem_refresh;
+	LineEdit *vmem_total;
+
 	Tree *stack_dump;
 	PropertyEditor *inspector;
 
@@ -94,11 +111,17 @@ class ScriptEditorDebugger : public Control {
 	Array message;
 	int pending_in_queue;
 
+	HashMap<NodePath,int> node_path_cache;
+	int last_path_id;
+	Map<String,int> res_path_cache;
+
 
 	EditorNode *editor;
 
 	bool breaked;
 
+	bool live_debug;
+
 	void _performance_draw();
 	void _performance_select(Object *, int, bool);
 	void _stack_dump_frame_selected();
@@ -108,6 +131,24 @@ class ScriptEditorDebugger : public Control {
 	void _scene_tree_request();
 	void _parse_message(const String& p_msg,const Array& p_data);
 
+	void _video_mem_request();
+
+	int _get_node_path_cache(const NodePath& p_path);
+
+	int _get_res_path_cache(const String& p_path);
+
+	void _live_edit_set();
+	void _live_edit_clear();
+
+	void _method_changed(Object*p_base,const StringName& p_name,VARIANT_ARG_DECLARE);
+	void _property_changed(Object*p_base,const StringName& p_property,const Variant& p_value);
+
+	static void _method_changeds(void *p_ud,Object*p_base,const StringName& p_name,VARIANT_ARG_DECLARE);
+	static void _property_changeds(void *p_ud,Object*p_base,const StringName& p_property,const Variant& p_value);
+
+	void _error_selected(int p_idx);
+	void _error_stack_selected(int p_idx);
+
 protected:
 
 	void _notification(int p_what);
@@ -127,6 +168,21 @@ public:
 
 	String get_var_value(const String& p_var) const;
 
+	void set_live_debugging(bool p_enable);
+
+	void live_debug_create_node(const NodePath& p_parent,const String& p_type,const String& p_name);
+	void live_debug_instance_node(const NodePath& p_parent,const String& p_path,const String& p_name);
+	void live_debug_remove_node(const NodePath& p_at);
+	void live_debug_remove_and_keep_node(const NodePath& p_at,ObjectID p_keep_id);
+	void live_debug_restore_node(ObjectID p_id,const NodePath& p_at,int p_at_pos);
+	void live_debug_duplicate_node(const NodePath& p_at,const String& p_new_name);
+	void live_debug_reparent_node(const NodePath& p_at,const NodePath& p_new_place,const String& p_new_name,int p_at_pos);
+
+	void set_breakpoint(const String& p_path,int p_line,bool p_enabled);
+
+	void update_live_edit_root();
+
+
 	virtual Size2 get_minimum_size() const;
 	ScriptEditorDebugger(EditorNode *p_editor=NULL);
 	~ScriptEditorDebugger();
diff --git a/tools/editor/spatial_editor_gizmos.cpp b/tools/editor/spatial_editor_gizmos.cpp
index 521a10bbd0..4dc9c4f43e 100644
--- a/tools/editor/spatial_editor_gizmos.cpp
+++ b/tools/editor/spatial_editor_gizmos.cpp
@@ -1,3191 +1,3191 @@
-/*************************************************************************/

-/*  spatial_editor_gizmos.cpp                                            */

-/*************************************************************************/

-/*                       This file is part of:                           */

-/*                           GODOT ENGINE                                */

-/*                    http://www.godotengine.org                         */

-/*************************************************************************/

-/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */

-/*                                                                       */

-/* Permission is hereby granted, free of charge, to any person obtaining */

-/* a copy of this software and associated documentation files (the       */

-/* "Software"), to deal in the Software without restriction, including   */

-/* without limitation the rights to use, copy, modify, merge, publish,   */

-/* distribute, sublicense, and/or sell copies of the Software, and to    */

-/* permit persons to whom the Software is furnished to do so, subject to */

-/* the following conditions:                                             */

-/*                                                                       */

-/* The above copyright notice and this permission notice shall be        */

-/* included in all copies or substantial portions of the Software.       */

-/*                                                                       */

-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */

-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */

-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/

-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */

-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */

-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */

-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */

-/*************************************************************************/

-#include "spatial_editor_gizmos.h"

-#include "geometry.h"

-#include "scene/3d/camera.h"

-#include "scene/resources/surface_tool.h"

-#include "scene/resources/sphere_shape.h"

-#include "scene/resources/box_shape.h"

-#include "scene/resources/capsule_shape.h"

-#include "scene/resources/ray_shape.h"

-#include "scene/resources/convex_polygon_shape.h"

-#include "scene/resources/plane_shape.h"

-#include "quick_hull.h"

-

-// Keep small children away from this file.

-// It's so ugly it will eat them alive

-

-#define HANDLE_HALF_SIZE 0.05

-

-void SpatialGizmoTool::clear() {

-

-	for(int i=0;i<instances.size();i++) {

-

-		if (instances[i].instance.is_valid())

-			VS::get_singleton()->free(instances[i].instance);

-

-

-	}

-

-	billboard_handle=false;

-	collision_segments.clear();

-	collision_mesh=Ref<TriangleMesh>();

-	instances.clear();

-	handles.clear();

-	secondary_handles.clear();

-}

-

-void SpatialGizmoTool::Instance::create_instance(Spatial *p_base) {

-

-	instance = VS::get_singleton()->instance_create2(mesh->get_rid(),p_base->get_world()->get_scenario());

-	VS::get_singleton()->instance_attach_object_instance_ID(instance,p_base->get_instance_ID());

-	if (billboard)

-		VS::get_singleton()->instance_geometry_set_flag(instance,VS::INSTANCE_FLAG_BILLBOARD,true);

-	if (unscaled)

-		VS::get_singleton()->instance_geometry_set_flag(instance,VS::INSTANCE_FLAG_DEPH_SCALE,true);

-	if (skeleton.is_valid())

-		VS::get_singleton()->instance_attach_skeleton(instance,skeleton);

-	if (extra_margin)

-		VS::get_singleton()->instance_set_extra_visibility_margin(instance,1);

-	VS::get_singleton()->instance_geometry_set_flag(instance,VS::INSTANCE_FLAG_CAST_SHADOW,false);

-	VS::get_singleton()->instance_geometry_set_flag(instance,VS::INSTANCE_FLAG_RECEIVE_SHADOWS,false);

-	VS::get_singleton()->instance_set_layer_mask(instance,1<<SpatialEditorViewport::GIZMO_EDIT_LAYER); //gizmos are 26

-}

-

-

-

-void SpatialGizmoTool::add_mesh(const Ref<Mesh>& p_mesh,bool p_billboard, const RID &p_skeleton) {

-

-	ERR_FAIL_COND(!spatial_node);

-	Instance ins;

-

-	ins.billboard=p_billboard;

-	ins.mesh=p_mesh;

-	ins.skeleton=p_skeleton;

-	if (valid) {

-		ins.create_instance(spatial_node);

-		VS::get_singleton()->instance_set_transform(ins.instance,spatial_node->get_global_transform());

-	}

-

-	instances.push_back(ins);

-

-}

-

-void SpatialGizmoTool::add_lines(const Vector<Vector3> &p_lines, const Ref<Material> &p_material,bool p_billboard){

-

-	ERR_FAIL_COND(!spatial_node);

-	Instance ins;

-

-	Ref<Mesh> mesh = memnew( Mesh );

-	Array a;

-	a.resize(Mesh::ARRAY_MAX);

-

-	a[Mesh::ARRAY_VERTEX]=p_lines;

-

-	DVector<Color> color;

-	color.resize(p_lines.size());

-	{

-		DVector<Color>::Write w = color.write();

-		for(int i=0;i<p_lines.size();i++) {

-			if (is_selected())

-				w[i]=Color(1,1,1,0.6);

-			else

-				w[i]=Color(1,1,1,0.25);

-		}

-

-	}

-

-	a[Mesh::ARRAY_COLOR]=color;

-

-

-	mesh->add_surface(Mesh::PRIMITIVE_LINES,a);

-	mesh->surface_set_material(0,p_material);

-

-	if (p_billboard) {

-		float md=0;

-		for(int i=0;i<p_lines.size();i++) {

-

-			md=MAX(0,p_lines[i].length());

-

-		}

-		if (md) {

-			mesh->set_custom_aabb(AABB(Vector3(-md,-md,-md),Vector3(md,md,md)*2.0));

-		}

-	}

-

-	ins.billboard=p_billboard;

-	ins.mesh=mesh;

-	if (valid) {

-		ins.create_instance(spatial_node);

-		VS::get_singleton()->instance_set_transform(ins.instance,spatial_node->get_global_transform());

-	}

-

-	instances.push_back(ins);

-

-}

-

-void SpatialGizmoTool::add_unscaled_billboard(const Ref<Material>& p_material,float p_scale) {

-

-	ERR_FAIL_COND(!spatial_node);

-	Instance ins;

-

-	Vector<Vector3 > vs;

-	Vector<Vector2 > uv;

-

-	vs.push_back(Vector3(-p_scale,p_scale,0));

-	vs.push_back(Vector3(p_scale,p_scale,0));

-	vs.push_back(Vector3(p_scale,-p_scale,0));

-	vs.push_back(Vector3(-p_scale,-p_scale,0));

-

-	uv.push_back(Vector2(1,0));

-	uv.push_back(Vector2(0,0));

-	uv.push_back(Vector2(0,1));

-	uv.push_back(Vector2(1,1));

-

-	Ref<Mesh> mesh = memnew( Mesh );

-	Array a;

-	a.resize(Mesh::ARRAY_MAX);

-	a[Mesh::ARRAY_VERTEX]=vs;

-	a[Mesh::ARRAY_TEX_UV]=uv;

-	mesh->add_surface(Mesh::PRIMITIVE_TRIANGLE_FAN,a);

-	mesh->surface_set_material(0,p_material);

-

-	if (true) {

-		float md=0;

-		for(int i=0;i<vs.size();i++) {

-

-			md=MAX(0,vs[i].length());

-

-		}

-		if (md) {

-			mesh->set_custom_aabb(AABB(Vector3(-md,-md,-md),Vector3(md,md,md)*2.0));

-		}

-	}

-

-	ins.mesh=mesh;

-	ins.unscaled=true;

-	ins.billboard=true;

-	if (valid) {

-		ins.create_instance(spatial_node);

-		VS::get_singleton()->instance_set_transform(ins.instance,spatial_node->get_global_transform());

-	}

-

-	instances.push_back(ins);

-

-

-}

-

-void SpatialGizmoTool::add_collision_triangles(const Ref<TriangleMesh>& p_tmesh) {

-

-	collision_mesh=p_tmesh;

-}

-

-void SpatialGizmoTool::add_collision_segments(const Vector<Vector3> &p_lines) {

-

-	int from=collision_segments.size();

-	collision_segments.resize(from+p_lines.size());

-	for(int i=0;i<p_lines.size();i++) {

-

-		collision_segments[from+i]=p_lines[i];

-	}

-}

-

-

-void SpatialGizmoTool::add_handles(const Vector<Vector3> &p_handles, bool p_billboard,bool p_secondary){

-

-	billboard_handle=p_billboard;

-

-	if (!is_selected())

-		return;

-

-	ERR_FAIL_COND(!spatial_node);

-

-	ERR_FAIL_COND(!spatial_node);

-	Instance ins;

-

-

-	Ref<Mesh> mesh = memnew( Mesh );

-#if 1

-

-	Array a;

-	a.resize(VS::ARRAY_MAX);

-	a[VS::ARRAY_VERTEX]=p_handles;

-	DVector<Color> colors;

-	{

-		colors.resize(p_handles.size());

-		DVector<Color>::Write w=colors.write();

-		for(int i=0;i<p_handles.size();i++) {

-

-			Color col(1,1,1,1);

-			if (SpatialEditor::get_singleton()->get_over_gizmo_handle()!=i)

-				col=Color(0.9,0.9,0.9,0.9);

-			w[i]=col;

-		}

-

-	}

-	a[VS::ARRAY_COLOR]=colors;

-	mesh->add_surface(Mesh::PRIMITIVE_POINTS,a);

-	mesh->surface_set_material(0,SpatialEditorGizmos::singleton->handle2_material);

-

-	if (p_billboard) {

-		float md=0;

-		for(int i=0;i<p_handles.size();i++) {

-

-			md=MAX(0,p_handles[i].length());

-

-		}

-		if (md) {

-			mesh->set_custom_aabb(AABB(Vector3(-md,-md,-md),Vector3(md,md,md)*2.0));

-		}

-	}

-

-

-

-#else

-	for(int ih=0;ih<p_handles.size();ih++) {

-

-

-		Vector<Vector3> vertices;

-		Vector<Vector3> normals;

-

-		int vtx_idx=0;

-#define ADD_VTX(m_idx);\

-	vertices.push_back( (face_points[m_idx]*HANDLE_HALF_SIZE+p_handles[ih]) );\

-	normals.push_back( normal_points[m_idx] );\

-	vtx_idx++;\

-

-		for (int i=0;i<6;i++) {

-

-

-			Vector3 face_points[4];

-			Vector3 normal_points[4];

-			float uv_points[8]={0,0,0,1,1,1,1,0};

-

-			for (int j=0;j<4;j++) {

-

-				float v[3];

-				v[0]=1.0;

-				v[1]=1-2*((j>>1)&1);

-				v[2]=v[1]*(1-2*(j&1));

-

-				for (int k=0;k<3;k++) {

-

-					if (i<3)

-						face_points[j][(i+k)%3]=v[k]*(i>=3?-1:1);

-					else

-						face_points[3-j][(i+k)%3]=v[k]*(i>=3?-1:1);

-				}

-				normal_points[j]=Vector3();

-				normal_points[j][i%3]=(i>=3?-1:1);

-			}

-			//tri 1

-			ADD_VTX(0);

-			ADD_VTX(1);

-			ADD_VTX(2);

-			//tri 2

-			ADD_VTX(2);

-			ADD_VTX(3);

-			ADD_VTX(0);

-

-		}

-

-

-		Array d;

-		d.resize(VS::ARRAY_MAX);

-		d[VisualServer::ARRAY_NORMAL]= normals ;

-		d[VisualServer::ARRAY_VERTEX]= vertices ;

-

-		mesh->add_surface(Mesh::PRIMITIVE_TRIANGLES,d);

-		mesh->surface_set_material(ih,SpatialEditorGizmos::singleton->handle_material);

-

-

-	}

-#endif

-	ins.mesh=mesh;

-	ins.billboard=p_billboard;

-	ins.extra_margin=true;

-	if (valid) {

-		ins.create_instance(spatial_node);

-		VS::get_singleton()->instance_set_transform(ins.instance,spatial_node->get_global_transform());

-	}

-	instances.push_back(ins);

-	if (!p_secondary) {

-		int chs=handles.size();

-		handles.resize(chs+p_handles.size());

-		for(int i=0;i<p_handles.size();i++) {

-			handles[i+chs]=p_handles[i];

-		}

-	} else {

-

-		int chs=secondary_handles.size();

-		secondary_handles.resize(chs+p_handles.size());

-		for(int i=0;i<p_handles.size();i++) {

-			secondary_handles[i+chs]=p_handles[i];

-		}

-

-	}

-

-}

-

-

-void SpatialGizmoTool::set_spatial_node(Spatial *p_node){

-

-	spatial_node=p_node;

-

-}

-

-bool SpatialGizmoTool::intersect_frustum(const Camera *p_camera,const Vector<Plane> &p_frustum) {

-

-	ERR_FAIL_COND_V(!spatial_node,false);

-	ERR_FAIL_COND_V(!valid,false);

-

-	if (collision_segments.size()) {

-

-		const Plane *p=p_frustum.ptr();

-		int fc=p_frustum.size();

-

-		int vc=collision_segments.size();

-		const Vector3* vptr=collision_segments.ptr();

-		Transform t = spatial_node->get_global_transform();

-

-		for(int i=0;i<vc/2;i++) {

-

-

-			Vector3 a=t.xform(vptr[i*2+0]);

-			Vector3 b=t.xform(vptr[i*2+1]);

-

-			bool any_out=false;

-			for(int j=0;j<fc;j++) {

-

-				if (p[j].distance_to(a) > 0 && p[j].distance_to(b) >0) {

-

-					any_out=true;

-					break;

-				}

-			}

-

-			if (!any_out)

-				return true;

-		}

-

-		return false;

-	}

-

-	return false;

-}

-

-

-bool SpatialGizmoTool::intersect_ray(const Camera *p_camera,const Point2& p_point,  Vector3& r_pos, Vector3& r_normal,int *r_gizmo_handle,bool p_sec_first) {

-

-	ERR_FAIL_COND_V(!spatial_node,false);

-	ERR_FAIL_COND_V(!valid,false);

-

-	if (r_gizmo_handle) {

-

-		Transform t = spatial_node->get_global_transform();

-		t.orthonormalize();

-		if (billboard_handle) {

-			t.set_look_at(t.origin,t.origin+p_camera->get_transform().basis.get_axis(2),p_camera->get_transform().basis.get_axis(1));

-		}

-		Transform ti=t.affine_inverse();

-

-		Vector3 ray_from=ti.xform(p_camera->project_ray_origin(p_point));

-		Vector3 ray_dir=t.basis.xform_inv(p_camera->project_ray_normal(p_point)).normalized();

-		Vector3 ray_to = ray_from+ray_dir*4096;

-

-		float min_d=1e20;

-		int idx=-1;

-

-		for(int i=0;i<secondary_handles.size();i++) {

-#if 1

-

-

-			Vector3 hpos = t.xform(secondary_handles[i]);

-			Vector2 p = p_camera->unproject_position(hpos);

-			if (p.distance_to(p_point)<SpatialEditorGizmos::singleton->handle_t->get_width()*0.6) {

-

-

-				real_t dp = p_camera->get_transform().origin.distance_to(hpos);

-				if (dp<min_d) {

-

-					r_pos=t.xform(hpos);

-					r_normal=p_camera->get_transform().basis.get_axis(2);

-					min_d=dp;

-					idx=i+handles.size();

-

-				}

-

-			}

-

-#else

-			AABB aabb;

-			aabb.pos=Vector3(-1,-1,-1)*HANDLE_HALF_SIZE;

-			aabb.size=aabb.pos*-2;

-			aabb.pos+=secondary_handles[i];

-

-

-			Vector3 rpos,rnorm;

-

-			if (aabb.intersects_segment(ray_from,ray_to,&rpos,&rnorm)) {

-

-				real_t dp = ray_dir.dot(rpos);

-				if (dp<min_d) {

-

-					r_pos=t.xform(rpos);

-					r_normal=ti.basis.xform_inv(rnorm).normalized();

-					min_d=dp;

-					idx=i+handles.size();

-

-				}

-			}

-#endif

-		}

-

-		if (p_sec_first && idx!=-1) {

-

-			*r_gizmo_handle=idx;

-			return true;

-		}

-

-		min_d=1e20;

-

-		for(int i=0;i<handles.size();i++) {

-

-#if 1

-

-

-			Vector3 hpos = t.xform(handles[i]);

-			Vector2 p = p_camera->unproject_position(hpos);

-			if (p.distance_to(p_point)<SpatialEditorGizmos::singleton->handle_t->get_width()*0.6) {

-

-

-				real_t dp = p_camera->get_transform().origin.distance_to(hpos);

-				if (dp<min_d) {

-

-					r_pos=t.xform(hpos);

-					r_normal=p_camera->get_transform().basis.get_axis(2);

-					min_d=dp;

-					idx=i;

-

-				}

-

-			}

-

-#else

-

-			AABB aabb;

-			aabb.pos=Vector3(-1,-1,-1)*HANDLE_HALF_SIZE;

-			aabb.size=aabb.pos*-2;

-			aabb.pos+=handles[i];

-

-

-			Vector3 rpos,rnorm;

-

-			if (aabb.intersects_segment(ray_from,ray_to,&rpos,&rnorm)) {

-

-				real_t dp = ray_dir.dot(rpos);

-				if (dp<min_d) {

-

-					r_pos=t.xform(rpos);

-					r_normal=ti.basis.xform_inv(rnorm).normalized();

-					min_d=dp;

-					idx=i;

-

-				}

-			}

-#endif

-		}

-

-		if (idx>=0) {

-			*r_gizmo_handle=idx;

-			return true;

-		}

-

-

-	}

-

-	if (collision_segments.size()) {

-

-		Plane camp(p_camera->get_transform().origin,(-p_camera->get_transform().basis.get_axis(2)).normalized());

-

-		int vc=collision_segments.size();

-		const Vector3* vptr=collision_segments.ptr();

-		Transform t = spatial_node->get_global_transform();

-		if (billboard_handle) {

-			t.set_look_at(t.origin,t.origin+p_camera->get_transform().basis.get_axis(2),p_camera->get_transform().basis.get_axis(1));

-		}

-

-		Vector3 cp;

-		float cpd=1e20;

-

-		for(int i=0;i<vc/2;i++) {

-

-

-			Vector3 a=t.xform(vptr[i*2+0]);

-			Vector3 b=t.xform(vptr[i*2+1]);

-			Vector2 s[2];

-			s[0] = p_camera->unproject_position(a);

-			s[1] = p_camera->unproject_position(b);

-

-

-			Vector2 p = Geometry::get_closest_point_to_segment_2d(p_point,s);

-

-			float pd = p.distance_to(p_point);

-

-			if (pd<cpd) {

-

-

-				float d = s[0].distance_to(s[1]);

-				Vector3 tcp;

-				if (d>0) {

-

-					float d2=s[0].distance_to(p)/d;

-					tcp = a+(b-a)*d2;

-

-				} else {

-					tcp=a;

-

-				}

-

-				if (camp.distance_to(tcp)<p_camera->get_znear())

-					continue;

-				cp=tcp;

-				cpd=pd;

-			}

-		}

-

-		if (cpd<8) {

-

-			r_pos=cp;

-			r_normal=-p_camera->project_ray_normal(p_point);

-			return true;

-		}

-

-		return false;

-	}

-

-

-	if (collision_mesh.is_valid()) {

-		Transform gt = spatial_node->get_global_transform();

-

-		if (billboard_handle) {

-			gt.set_look_at(gt.origin,gt.origin+p_camera->get_transform().basis.get_axis(2),p_camera->get_transform().basis.get_axis(1));

-		}

-

-		Transform ai=gt.affine_inverse();

-		Vector3 ray_from = ai.xform(p_camera->project_ray_origin(p_point));

-		Vector3 ray_dir=ai.basis.xform(p_camera->project_ray_normal(p_point)).normalized();

-		Vector3 rpos,rnorm;

-

-#if 1

-

-

-

-		if (collision_mesh->intersect_ray(ray_from,ray_dir,rpos,rnorm)) {

-

-			r_pos=gt.xform(rpos);

-			r_normal=gt.basis.xform(rnorm).normalized();

-			return true;

-		}

-#else

-

-		if (collision_mesh->intersect_segment(ray_from,ray_from+ray_dir*4906.0,rpos,rnorm)) {

-

-			r_pos=gt.xform(rpos);

-			r_normal=gt.basis.xform(rnorm).normalized();

-			return true;

-		}

-

-#endif

-	}

-

-	return false;

-

-}

-

-

-

-void SpatialGizmoTool::create() {

-

-	ERR_FAIL_COND(!spatial_node);

-	ERR_FAIL_COND(valid);

-	valid=true;

-

-	for(int i=0;i<instances.size();i++) {

-

-		instances[i].create_instance(spatial_node);

-	}

-

-	transform();

-

-}

-

-void SpatialGizmoTool::transform(){

-

-	ERR_FAIL_COND(!spatial_node);

-	ERR_FAIL_COND(!valid);

-	for(int i=0;i<instances.size();i++) {

-		VS::get_singleton()->instance_set_transform(instances[i].instance,spatial_node->get_global_transform());

-	}

-

-}

-

-

-void SpatialGizmoTool::free(){

-

-	ERR_FAIL_COND(!spatial_node);

-	ERR_FAIL_COND(!valid);

-

-	for(int i=0;i<instances.size();i++) {

-

-		if (instances[i].instance.is_valid())

-			VS::get_singleton()->free(instances[i].instance);

-		instances[i].instance=RID();

-	}

-

-	valid=false;

-

-

-}

-

-

-

-SpatialGizmoTool::SpatialGizmoTool() {

-	valid=false;

-	billboard_handle=false;

-

-}

-

-SpatialGizmoTool::~SpatialGizmoTool(){

-

-	clear();

-}

-

-Vector3 SpatialGizmoTool::get_handle_pos(int p_idx) const {

-

-	ERR_FAIL_INDEX_V(p_idx,handles.size(),Vector3());

-

-	return handles[p_idx];

-

-}

-

-//// light gizmo

-

-

-String LightSpatialGizmo::get_handle_name(int p_idx) const {

-

-	if (p_idx==0)

-		return "Radius";

-	else

-		return "Aperture";

-}

-

-

-Variant LightSpatialGizmo::get_handle_value(int p_idx) const{

-

-	if (p_idx==0)

-		return light->get_parameter(Light::PARAM_RADIUS);

-	if (p_idx==1)

-		return light->get_parameter(Light::PARAM_SPOT_ANGLE);

-

-	return Variant();

-}

-

-

-static float _find_closest_angle_to_half_pi_arc(const Vector3& p_from, const Vector3& p_to, float p_arc_radius,const Transform& p_arc_xform) {

-

-	//bleh, discrete is simpler

-	static const int arc_test_points=64;

-	float min_d = 1e20;

-	Vector3 min_p;

-

-

-	for(int i=0;i<arc_test_points;i++) {

-

-		float a = i*Math_PI*0.5/arc_test_points;

-		float an = (i+1)*Math_PI*0.5/arc_test_points;

-		Vector3 p=Vector3( Math::cos(a), 0, -Math::sin(a) )*p_arc_radius;

-		Vector3 n=Vector3( Math::cos(an), 0,- Math::sin(an) )*p_arc_radius;

-

-		Vector3 ra,rb;

-		Geometry::get_closest_points_between_segments(p,n,p_from,p_to,ra,rb);

-

-		float d = ra.distance_to(rb);

-		if (d<min_d) {

-			min_d=d;

-			min_p=ra;

-		}

-

-	}

-

-	//min_p = p_arc_xform.affine_inverse().xform(min_p);

-	float a = Vector2(min_p.x,-min_p.z).atan2();

-	return a*180.0/Math_PI;

-}

-

-

-void LightSpatialGizmo::set_handle(int p_idx,Camera *p_camera, const Point2& p_point) {

-

-	Transform gt = light->get_global_transform();

-	gt.orthonormalize();

-	Transform gi = gt.affine_inverse();

-

-	Vector3 ray_from = p_camera->project_ray_origin(p_point);

-	Vector3 ray_dir = p_camera->project_ray_normal(p_point);

-

-	Vector3 s[2]={gi.xform(ray_from),gi.xform(ray_from+ray_dir*4096)};

-	if (p_idx==0) {

-

-		if (light->cast_to<SpotLight>()) {

-			Vector3 ra,rb;

-			Geometry::get_closest_points_between_segments(Vector3(),Vector3(0,0,-4096),s[0],s[1],ra,rb);

-

-			float d = -ra.z;

-			if (d<0)

-				d=0;

-

-			light->set_parameter(Light::PARAM_RADIUS,d);

-		} else if (light->cast_to<OmniLight>()) {

-

-			Plane cp=Plane( gt.origin, p_camera->get_transform().basis.get_axis(2));

-

-			Vector3 inters;

-			if (cp.intersects_ray(ray_from,ray_dir,&inters)) {

-

-				float r = inters.distance_to(gt.origin);

-				light->set_parameter(Light::PARAM_RADIUS,r);

-			}

-

-		}

-

-	} else if (p_idx==1) {

-

-		float a = _find_closest_angle_to_half_pi_arc(s[0],s[1],light->get_parameter(Light::PARAM_RADIUS),gt);

-		light->set_parameter(Light::PARAM_SPOT_ANGLE,CLAMP(a,0.01,89.99));

-	}

-}

-

-void LightSpatialGizmo::commit_handle(int p_idx,const Variant& p_restore,bool p_cancel){

-

-	if (p_cancel) {

-

-		light->set_parameter(p_idx==0?Light::PARAM_RADIUS:Light::PARAM_SPOT_ANGLE,p_restore);

-

-	} else if (p_idx==0) {

-

-		UndoRedo *ur = SpatialEditor::get_singleton()->get_undo_redo();

-		ur->create_action("Change Light Radius");

-		ur->add_do_method(light,"set_parameter",Light::PARAM_RADIUS,light->get_parameter(Light::PARAM_RADIUS));

-		ur->add_undo_method(light,"set_parameter",Light::PARAM_RADIUS,p_restore);

-		ur->commit_action();

-	} else if (p_idx==1) {

-

-		UndoRedo *ur = SpatialEditor::get_singleton()->get_undo_redo();

-		ur->create_action("Change Light Radius");

-		ur->add_do_method(light,"set_parameter",Light::PARAM_SPOT_ANGLE,light->get_parameter(Light::PARAM_SPOT_ANGLE));

-		ur->add_undo_method(light,"set_parameter",Light::PARAM_SPOT_ANGLE,p_restore);

-		ur->commit_action();

-

-	}

-}

-

-

-

-void LightSpatialGizmo::redraw() {

-

-

-	if (light->cast_to<DirectionalLight>()) {

-

-

-

-		const int arrow_points=5;

-		Vector3 arrow[arrow_points]={

-			Vector3(0,0,2),

-			Vector3(1,1,2),

-			Vector3(1,1,-1),

-			Vector3(2,2,-1),

-			Vector3(0,0,-3)

-		};

-

-		int arrow_sides=4;

-

-		Vector<Vector3> lines;

-

-

-		for(int i = 0; i < arrow_sides ; i++) {

-

-

-			Matrix3 ma(Vector3(0,0,1),Math_PI*2*float(i)/arrow_sides);

-			Matrix3 mb(Vector3(0,0,1),Math_PI*2*float(i+1)/arrow_sides);

-

-

-			for(int j=1;j<arrow_points-1;j++) {

-

-				if (j!=2) {

-					lines.push_back(ma.xform(arrow[j]));

-					lines.push_back(ma.xform(arrow[j+1]));

-				}

-				if (j<arrow_points-1) {

-					lines.push_back(ma.xform(arrow[j]));

-					lines.push_back(mb.xform(arrow[j]));

-				}

-

-			}

-		}

-

-		add_lines(lines,SpatialEditorGizmos::singleton->light_material);

-		add_collision_segments(lines);

-		add_unscaled_billboard(SpatialEditorGizmos::singleton->light_material_directional_icon,0.05);

-

-	}

-

-	if (light->cast_to<OmniLight>()) {

-

-		clear();

-

-

-		OmniLight *on = light->cast_to<OmniLight>();

-

-		float r = on->get_parameter(Light::PARAM_RADIUS);

-

-		Vector<Vector3> points;

-

-		for(int i=0;i<=360;i++) {

-

-			float ra=Math::deg2rad(i);

-			float rb=Math::deg2rad(i+1);

-			Point2 a = Vector2(Math::sin(ra),Math::cos(ra))*r;

-			Point2 b = Vector2(Math::sin(rb),Math::cos(rb))*r;

-

-			/*points.push_back(Vector3(a.x,0,a.y));

-			points.push_back(Vector3(b.x,0,b.y));

-			points.push_back(Vector3(0,a.x,a.y));

-			points.push_back(Vector3(0,b.x,b.y));*/

-			points.push_back(Vector3(a.x,a.y,0));

-			points.push_back(Vector3(b.x,b.y,0));

-

-		}

-

-		add_lines(points,SpatialEditorGizmos::singleton->light_material,true);

-		add_collision_segments(points);

-

-		add_unscaled_billboard(SpatialEditorGizmos::singleton->light_material_omni_icon,0.05);

-

-		Vector<Vector3> handles;

-		handles.push_back(Vector3(r,0,0));

-		add_handles(handles,true);

-

-

-	}

-

-

-	if (light->cast_to<SpotLight>()) {

-

-		clear();

-

-		Vector<Vector3> points;

-		SpotLight *on = light->cast_to<SpotLight>();

-

-		float r = on->get_parameter(Light::PARAM_RADIUS);

-		float w = r*Math::sin(Math::deg2rad(on->get_parameter(Light::PARAM_SPOT_ANGLE)));

-		float d = r*Math::cos(Math::deg2rad(on->get_parameter(Light::PARAM_SPOT_ANGLE)));

-

-

-

-		for(int i=0;i<360;i++) {

-

-			float ra=Math::deg2rad(i);

-			float rb=Math::deg2rad(i+1);

-			Point2 a = Vector2(Math::sin(ra),Math::cos(ra))*w;

-			Point2 b = Vector2(Math::sin(rb),Math::cos(rb))*w;

-

-			/*points.push_back(Vector3(a.x,0,a.y));

-			points.push_back(Vector3(b.x,0,b.y));

-			points.push_back(Vector3(0,a.x,a.y));

-			points.push_back(Vector3(0,b.x,b.y));*/

-			points.push_back(Vector3(a.x,a.y,-d));

-			points.push_back(Vector3(b.x,b.y,-d));

-

-			if (i%90==0) {

-

-				points.push_back(Vector3(a.x,a.y,-d));

-				points.push_back(Vector3());

-

-			}

-

-

-		}

-

-		points.push_back(Vector3(0,0,-r));

-		points.push_back(Vector3());

-

-		add_lines(points,SpatialEditorGizmos::singleton->light_material);

-

-		Vector<Vector3> handles;

-		handles.push_back(Vector3(0,0,-r));

-

-		Vector<Vector3> collision_segments;

-

-		for(int i=0;i<64;i++) {

-

-			float ra=i*Math_PI*2.0/64.0;

-			float rb=(i+1)*Math_PI*2.0/64.0;

-			Point2 a = Vector2(Math::sin(ra),Math::cos(ra))*w;

-			Point2 b = Vector2(Math::sin(rb),Math::cos(rb))*w;

-

-			collision_segments.push_back(Vector3(a.x,a.y,-d));

-			collision_segments.push_back(Vector3(b.x,b.y,-d));

-

-			if (i%16==0) {

-

-				collision_segments.push_back(Vector3(a.x,a.y,-d));

-				collision_segments.push_back(Vector3());

-

-			}

-

-			if (i==16) {

-

-				handles.push_back(Vector3(a.x,a.y,-d));

-			}

-

-		}

-

-		collision_segments.push_back(Vector3(0,0,-r));

-		collision_segments.push_back(Vector3());

-

-

-		add_handles(handles);

-		add_collision_segments(collision_segments);

-		add_unscaled_billboard(SpatialEditorGizmos::singleton->light_material_omni_icon,0.05);

-

-	}

-

-}

-

-LightSpatialGizmo::LightSpatialGizmo(Light* p_light){

-

-	light=p_light;

-	set_spatial_node(p_light);

-

-}

-

-//////

-

-String CameraSpatialGizmo::get_handle_name(int p_idx) const {

-

-	if (camera->get_projection()==Camera::PROJECTION_PERSPECTIVE) {

-		return "FOV";

-	} else {

-		return "Size";

-	}

-}

-Variant CameraSpatialGizmo::get_handle_value(int p_idx) const{

-

-	if (camera->get_projection()==Camera::PROJECTION_PERSPECTIVE) {

-		return camera->get_fov();

-	} else {

-

-		return camera->get_size();

-	}

-}

-void CameraSpatialGizmo::set_handle(int p_idx,Camera *p_camera, const Point2& p_point){

-

-	Transform gt = camera->get_global_transform();

-	gt.orthonormalize();

-	Transform gi = gt.affine_inverse();

-

-	Vector3 ray_from = p_camera->project_ray_origin(p_point);

-	Vector3 ray_dir = p_camera->project_ray_normal(p_point);

-

-	Vector3 s[2]={gi.xform(ray_from),gi.xform(ray_from+ray_dir*4096)};

-

-	if (camera->get_projection()==Camera::PROJECTION_PERSPECTIVE) {

-		Transform gt=camera->get_global_transform();

-		float a = _find_closest_angle_to_half_pi_arc(s[0],s[1],1.0,gt);

-		camera->set("fov",a);

-	} else {

-

-		Vector3 ra,rb;

-		Geometry::get_closest_points_between_segments(Vector3(0,0,-1),Vector3(4096,0,-1),s[0],s[1],ra,rb);

-		float d = ra.x * 2.0;

-		if (d<0)

-			d=0;

-

-		camera->set("size",d);

-	}

-

-}

-void CameraSpatialGizmo::commit_handle(int p_idx,const Variant& p_restore,bool p_cancel){

-

-	if (camera->get_projection()==Camera::PROJECTION_PERSPECTIVE) {

-

-		if (p_cancel) {

-

-			camera->set("fov",p_restore);

-		} else {

-			UndoRedo *ur = SpatialEditor::get_singleton()->get_undo_redo();

-			ur->create_action("Change Camera FOV");

-			ur->add_do_property(camera,"fov",camera->get_fov());

-			ur->add_undo_property(camera,"fov",p_restore);

-			ur->commit_action();

-		}

-

-	} else {

-

-		if (p_cancel) {

-

-			camera->set("size",p_restore);

-		} else {

-			UndoRedo *ur = SpatialEditor::get_singleton()->get_undo_redo();

-			ur->create_action("Change Camera Size");

-			ur->add_do_property(camera,"size",camera->get_size());

-			ur->add_undo_property(camera,"size",p_restore);

-			ur->commit_action();

-		}

-

-	}

-

-}

-

-void CameraSpatialGizmo::redraw(){

-

-	clear();

-

-	Vector<Vector3> lines;

-	Vector<Vector3> handles;

-

-

-	switch(camera->get_projection()) {

-

-		case Camera::PROJECTION_PERSPECTIVE: {

-

-			float fov = camera->get_fov();

-

-			Vector3 side=Vector3( Math::sin(Math::deg2rad(fov)), 0, -Math::cos(Math::deg2rad(fov)) );

-			Vector3 nside=side;

-			nside.x=-nside.x;

-			Vector3 up=Vector3(0,side.x,0);

-

-

-#define ADD_TRIANGLE( m_a, m_b, m_c)\

-{\

-	lines.push_back(m_a);\

-	lines.push_back(m_b);\

-	lines.push_back(m_b);\

-	lines.push_back(m_c);\

-	lines.push_back(m_c);\

-	lines.push_back(m_a);\

-}

-

-			ADD_TRIANGLE( Vector3(), side+up, side-up );

-			ADD_TRIANGLE( Vector3(), nside+up, nside-up );

-			ADD_TRIANGLE( Vector3(), side+up, nside+up );

-			ADD_TRIANGLE( Vector3(), side-up, nside-up );

-

-			handles.push_back(side);

-			side.x*=0.25;

-			nside.x*=0.25;

-			Vector3 tup( 0, up.y*3/2,side.z);

-			ADD_TRIANGLE( tup, side+up, nside+up );

-

-		} break;

-		case Camera::PROJECTION_ORTHOGONAL: {

-

-#define ADD_QUAD( m_a, m_b, m_c, m_d)\

-{\

-	lines.push_back(m_a);\

-	lines.push_back(m_b);\

-	lines.push_back(m_b);\

-	lines.push_back(m_c);\

-	lines.push_back(m_c);\

-	lines.push_back(m_d);\

-	lines.push_back(m_d);\

-	lines.push_back(m_a);\

-}

-			float size = camera->get_size();

-

-			float hsize=size*0.5;

-			Vector3 right(hsize,0,0);

-			Vector3 up(0,hsize,0);

-			Vector3 back(0,0,-1.0);

-			Vector3 front(0,0,0);

-

-			ADD_QUAD( -up-right,-up+right,up+right,up-right);

-			ADD_QUAD( -up-right+back,-up+right+back,up+right+back,up-right+back);

-			ADD_QUAD( up+right,up+right+back,up-right+back,up-right);

-			ADD_QUAD( -up+right,-up+right+back,-up-right+back,-up-right);

-			handles.push_back(right+back);

-

-			right.x*=0.25;

-			Vector3 tup( 0, up.y*3/2,back.z );

-			ADD_TRIANGLE( tup, right+up+back, -right+up+back );

-

-		} break;

-

-	}

-

-	add_lines(lines,SpatialEditorGizmos::singleton->camera_material);

-	add_collision_segments(lines);

-	add_handles(handles);

-}

-

-

-CameraSpatialGizmo::CameraSpatialGizmo(Camera* p_camera){

-

-	camera=p_camera;

-	set_spatial_node(camera);

-}

-

-

-

-

-//////

-

-void MeshInstanceSpatialGizmo::redraw() {

-

-	Ref<Mesh> m = mesh->get_mesh();

-	if (!m.is_valid())

-		return; //none

-

-	Ref<TriangleMesh> tm = m->generate_triangle_mesh();

-	if (tm.is_valid())

-		add_collision_triangles(tm);

-}

-

-MeshInstanceSpatialGizmo::MeshInstanceSpatialGizmo(MeshInstance* p_mesh) {

-

-	mesh=p_mesh;

-	set_spatial_node(p_mesh);

-}

-

-/////

-

-

-void Position3DSpatialGizmo::redraw() {

-

-	clear();

-	add_mesh(SpatialEditorGizmos::singleton->pos3d_mesh);

-	Vector<Vector3> cursor_points;

-	float cs = 0.25;

-	cursor_points.push_back(Vector3(+cs,0,0));

-	cursor_points.push_back(Vector3(-cs,0,0));

-	cursor_points.push_back(Vector3(0,+cs,0));

-	cursor_points.push_back(Vector3(0,-cs,0));

-	cursor_points.push_back(Vector3(0,0,+cs));

-	cursor_points.push_back(Vector3(0,0,-cs));

-	add_collision_segments(cursor_points);

-

-}

-

-

-Position3DSpatialGizmo::Position3DSpatialGizmo(Position3D* p_p3d) {

-

-	p3d=p_p3d;

-	set_spatial_node(p3d);

-}

-

-

-/////

-

-void SkeletonSpatialGizmo::redraw() {

-

-	clear();

-

-	Ref<SurfaceTool> surface_tool( memnew( SurfaceTool ));

-

-

-	surface_tool->begin(Mesh::PRIMITIVE_LINES);

-	surface_tool->set_material(SpatialEditorGizmos::singleton->skeleton_material);

-	Vector<Transform> grests;

-	grests.resize(skel->get_bone_count());

-

-	Vector<int> bones;

-	Vector<float> weights;

-	bones.resize(4);

-	weights.resize(4);

-

-	for(int i=0;i<4;i++) {

-		bones[i]=0;

-		weights[i]=0;

-	}

-

-	weights[0]=1;

-

-

-	AABB aabb;

-

-	Color bonecolor = Color(1.0,0.4,0.4,0.3);

-	Color rootcolor = Color(0.4,1.0,0.4,0.1);

-

-	for (int i=0;i<skel->get_bone_count();i++) {

-

-		int parent = skel->get_bone_parent(i);

-

-		if (parent>=0) {

-			grests[i]=grests[parent] * skel->get_bone_rest(i);

-

-			Vector3 v0 = grests[parent].origin;

-			Vector3 v1 = grests[i].origin;

-			Vector3 d = (v1-v0).normalized();

-			float dist = v0.distance_to(v1);

-

-			//find closest axis

-			int closest=-1;

-			float closest_d = 0.0;

-

-			for(int j=0;j<3;j++) {

-				float dp = Math::abs(grests[parent].basis[j].normalized().dot(d));

-				if (j==0 || dp>closest_d)

-					closest=j;

-			}

-

-			//find closest other

-			Vector3 first;

-			Vector3 points[4];

-			int pointidx=0;

-			for(int j=0;j<3;j++) {

-

-				bones[0]=parent;

-				surface_tool->add_bones(bones);

-				surface_tool->add_weights(weights);

-				surface_tool->add_color(rootcolor);

-				surface_tool->add_vertex(v0-grests[parent].basis[j].normalized()*dist*0.05);

-				surface_tool->add_bones(bones);

-				surface_tool->add_weights(weights);

-				surface_tool->add_color(rootcolor);

-				surface_tool->add_vertex(v0+grests[parent].basis[j].normalized()*dist*0.05);

-

-				if (j==closest)

-					continue;

-

-				Vector3 axis;

-				if (first==Vector3()) {

-					axis = d.cross(d.cross(grests[parent].basis[j])).normalized();

-					first=axis;

-				} else {

-					axis = d.cross(first).normalized();

-				}

-

-				for(int k=0;k<2;k++) {

-

-					if (k==1)

-						axis=-axis;

-					Vector3 point = v0+d*dist*0.2;

-					point+=axis*dist*0.1;

-

-

-					bones[0]=parent;

-					surface_tool->add_bones(bones);

-					surface_tool->add_weights(weights);

-					surface_tool->add_color(bonecolor);

-					surface_tool->add_vertex(v0);

-					surface_tool->add_bones(bones);

-					surface_tool->add_weights(weights);

-					surface_tool->add_color(bonecolor);

-					surface_tool->add_vertex(point);

-

-					bones[0]=parent;

-					surface_tool->add_bones(bones);

-					surface_tool->add_weights(weights);

-					surface_tool->add_color(bonecolor);

-					surface_tool->add_vertex(point);

-					bones[0]=i;

-					surface_tool->add_bones(bones);

-					surface_tool->add_weights(weights);

-					surface_tool->add_color(bonecolor);

-					surface_tool->add_vertex(v1);

-					points[pointidx++]=point;

-

-				}

-

-			}

-

-			SWAP( points[1],points[2] );

-			for(int j=0;j<4;j++) {

-

-

-				bones[0]=parent;

-				surface_tool->add_bones(bones);

-				surface_tool->add_weights(weights);

-				surface_tool->add_color(bonecolor);

-				surface_tool->add_vertex(points[j]);

-				surface_tool->add_bones(bones);

-				surface_tool->add_weights(weights);

-				surface_tool->add_color(bonecolor);

-				surface_tool->add_vertex(points[(j+1)%4]);

-			}

-

-

-/*

-			bones[0]=parent;

-			surface_tool->add_bones(bones);

-			surface_tool->add_weights(weights);

-			surface_tool->add_color(Color(0.4,1,0.4,0.4));

-			surface_tool->add_vertex(v0);

-			bones[0]=i;

-			surface_tool->add_bones(bones);

-			surface_tool->add_weights(weights);

-			surface_tool->add_color(Color(0.4,1,0.4,0.4));

-			surface_tool->add_vertex(v1);

-*/

-		} else {

-

-			grests[i]=skel->get_bone_rest(i);

-			bones[0]=i;

-		}

-/*

-		Transform  t = grests[i];

-		t.orthonormalize();

-

-		for (int i=0;i<6;i++) {

-

-

-			Vector3 face_points[4];

-

-			for (int j=0;j<4;j++) {

-

-				float v[3];

-				v[0]=1.0;

-				v[1]=1-2*((j>>1)&1);

-				v[2]=v[1]*(1-2*(j&1));

-

-				for (int k=0;k<3;k++) {

-

-					if (i<3)

-						face_points[j][(i+k)%3]=v[k]*(i>=3?-1:1);

-					else

-						face_points[3-j][(i+k)%3]=v[k]*(i>=3?-1:1);

-				}

-			}

-

-			for(int j=0;j<4;j++) {

-				surface_tool->add_bones(bones);

-				surface_tool->add_weights(weights);

-				surface_tool->add_color(Color(1.0,0.4,0.4,0.4));

-				surface_tool->add_vertex(t.xform(face_points[j]*0.04));

-				surface_tool->add_bones(bones);

-				surface_tool->add_weights(weights);

-				surface_tool->add_color(Color(1.0,0.4,0.4,0.4));

-				surface_tool->add_vertex(t.xform(face_points[(j+1)%4]*0.04));

-			}

-

-		}

-		*/

-	}

-

-	Ref<Mesh> m = surface_tool->commit();

-	add_mesh(m,false,skel->get_skeleton());

-

-}

-

-SkeletonSpatialGizmo::SkeletonSpatialGizmo(Skeleton* p_skel) {

-

-	skel=p_skel;

-	set_spatial_node(p_skel);

-}

-

-/////

-

-

-void SpatialPlayerSpatialGizmo::redraw() {

-

-	clear();

-	if (splayer->cast_to<SpatialStreamPlayer>()) {

-

-		add_unscaled_billboard(SpatialEditorGizmos::singleton->stream_player_icon,0.05);

-

-	} else if (splayer->cast_to<SpatialSamplePlayer>()) {

-

-		add_unscaled_billboard(SpatialEditorGizmos::singleton->sample_player_icon,0.05);

-

-	}

-

-}

-

-SpatialPlayerSpatialGizmo::SpatialPlayerSpatialGizmo(SpatialPlayer* p_splayer){

-

-	set_spatial_node(p_splayer);

-	splayer=p_splayer;

-}

-

-

-/////

-

-

-void RoomSpatialGizmo::redraw() {

-

-	clear();

-	Ref<RoomBounds> roomie = room->get_room();

-	if (roomie.is_null())

-		return;

-	DVector<Face3> faces = roomie->get_geometry_hint();

-

-	Vector<Vector3> lines;

-	int fc=faces.size();

-	DVector<Face3>::Read r =faces.read();

-

-	Map<_EdgeKey,Vector3> edge_map;

-

-	for(int i=0;i<fc;i++) {

-

-		Vector3 fn = r[i].get_plane().normal;

-

-		for(int j=0;j<3;j++) {

-

-			_EdgeKey ek;

-			ek.from=r[i].vertex[j].snapped(CMP_EPSILON);

-			ek.to=r[i].vertex[(j+1)%3].snapped(CMP_EPSILON);

-			if (ek.from<ek.to)

-				SWAP(ek.from,ek.to);

-

-			Map<_EdgeKey,Vector3>::Element *E=edge_map.find(ek);

-

-			if (E) {

-

-				if (E->get().dot(fn) >0.9) {

-

-					E->get()=Vector3();

-				}

-

-			} else {

-

-				edge_map[ek]=fn;

-			}

-

-		}

-	}

-

-	for(Map<_EdgeKey,Vector3>::Element *E=edge_map.front();E;E=E->next()) {

-

-		if (E->get()!=Vector3()) {

-			lines.push_back(E->key().from);

-			lines.push_back(E->key().to);

-		}

-	}

-

-	add_lines(lines,SpatialEditorGizmos::singleton->room_material);

-	add_collision_segments(lines);

-

-}

-

-RoomSpatialGizmo::RoomSpatialGizmo(Room* p_room){

-

-	set_spatial_node(p_room);

-	room=p_room;

-}

-

-/////

-

-

-void PortalSpatialGizmo::redraw() {

-

-	clear();

-

-	Vector<Point2> points = portal->get_shape();

-	if (points.size()==0) {

-		return;

-	}

-

-	Vector<Vector3> lines;

-

-	Vector3 center;

-	for(int i=0;i<points.size();i++) {

-

-		Vector3 f;

-		f.x=points[i].x;

-		f.y=points[i].y;

-		Vector3 fn;

-		fn.x=points[(i+1)%points.size()].x;

-		fn.y=points[(i+1)%points.size()].y;

-		center+=f;

-

-		lines.push_back(f);

-		lines.push_back(fn);

-	}

-

-	center/=points.size();

-	lines.push_back(center);

-	lines.push_back(center+Vector3(0,0,1));

-

-	add_lines(lines,SpatialEditorGizmos::singleton->portal_material);

-	add_collision_segments(lines);

-

-}

-

-PortalSpatialGizmo::PortalSpatialGizmo(Portal* p_portal){

-

-	set_spatial_node(p_portal);

-	portal=p_portal;

-}

-

-/////

-

-

-void RayCastSpatialGizmo::redraw() {

-

-	clear();

-

-

-	Vector<Vector3> lines;

-

-	lines.push_back(Vector3());

-	lines.push_back(raycast->get_cast_to());

-

-	add_lines(lines,SpatialEditorGizmos::singleton->raycast_material);

-	add_collision_segments(lines);

-

-}

-

-RayCastSpatialGizmo::RayCastSpatialGizmo(RayCast* p_raycast){

-

-	set_spatial_node(p_raycast);

-	raycast=p_raycast;

-}

-

-

-

-/////

-

-

-void VehicleWheelSpatialGizmo::redraw() {

-

-	clear();

-

-

-	Vector<Vector3> points;

-

-	float r = car_wheel->get_radius();

-	const int skip=10;

-	for(int i=0;i<=360;i+=skip) {

-

-		float ra=Math::deg2rad(i);

-		float rb=Math::deg2rad(i+skip);

-		Point2 a = Vector2(Math::sin(ra),Math::cos(ra))*r;

-		Point2 b = Vector2(Math::sin(rb),Math::cos(rb))*r;

-

-		points.push_back(Vector3(0,a.x,a.y));

-		points.push_back(Vector3(0,b.x,b.y));

-

-		const int springsec=4;

-

-		for(int j=0;j<springsec;j++) {

-			float t = car_wheel->get_suspension_rest_length()*5;

-			points.push_back(Vector3(a.x,i/360.0*t/springsec+j*(t/springsec),a.y)*0.2);

-			points.push_back(Vector3(b.x,(i+skip)/360.0*t/springsec+j*(t/springsec),b.y)*0.2);

-		}

-

-

-	}

-

-	//travel

-	points.push_back(Vector3(0,0,0));

-	points.push_back(Vector3(0,car_wheel->get_suspension_rest_length(),0));

-

-	//axis

-	points.push_back(Vector3(r*0.2,car_wheel->get_suspension_rest_length(),0));

-	points.push_back(Vector3(-r*0.2,car_wheel->get_suspension_rest_length(),0));

-	//axis

-	points.push_back(Vector3(r*0.2,0,0));

-	points.push_back(Vector3(-r*0.2,0,0));

-

-	//forward line

-	points.push_back(Vector3(0,-r,0));

-	points.push_back(Vector3(0,-r,r*2));

-	points.push_back(Vector3(0,-r,r*2));

-	points.push_back(Vector3(r*2*0.2,-r,r*2*0.8));

-	points.push_back(Vector3(0,-r,r*2));

-	points.push_back(Vector3(-r*2*0.2,-r,r*2*0.8));

-

-	add_lines(points,SpatialEditorGizmos::singleton->car_wheel_material);

-	add_collision_segments(points);

-

-}

-

-VehicleWheelSpatialGizmo::VehicleWheelSpatialGizmo(VehicleWheel* p_car_wheel){

-

-	set_spatial_node(p_car_wheel);

-	car_wheel=p_car_wheel;

-}

-

-

-

-///

-

-void TestCubeSpatialGizmo::redraw() {

-

-	clear();

-	add_collision_triangles(SpatialEditorGizmos::singleton->test_cube_tm);

-}

-

-TestCubeSpatialGizmo::TestCubeSpatialGizmo(TestCube* p_tc) {

-

-	tc=p_tc;

-	set_spatial_node(p_tc);

-}

-

-

-///////////

-

-

-

-

-

-

-String CollisionShapeSpatialGizmo::get_handle_name(int p_idx) const {

-

-	Ref<Shape> s = cs->get_shape();

-	if (s.is_null())

-		return "";

-

-	if (s->cast_to<SphereShape>()) {

-

-		return "Radius";

-	}

-

-	if (s->cast_to<BoxShape>()) {

-

-		return "Extents";

-	}

-

-	if (s->cast_to<CapsuleShape>()) {

-

-		return p_idx==0?"Radius":"Height";

-	}

-

-	if (s->cast_to<RayShape>()) {

-

-		return "Length";

-	}

-

-	return "";

-}

-Variant CollisionShapeSpatialGizmo::get_handle_value(int p_idx) const{

-

-	Ref<Shape> s = cs->get_shape();

-	if (s.is_null())

-		return Variant();

-

-	if (s->cast_to<SphereShape>()) {

-

-		Ref<SphereShape> ss = s;

-		return ss->get_radius();

-	}

-

-	if (s->cast_to<BoxShape>()) {

-

-		Ref<BoxShape> bs = s;

-		return bs->get_extents();

-	}

-

-	if (s->cast_to<CapsuleShape>()) {

-

-		Ref<CapsuleShape> cs = s;

-		return p_idx==0?cs->get_radius():cs->get_height();

-	}

-

-	if (s->cast_to<RayShape>()) {

-

-		Ref<RayShape> cs = s;

-		return cs->get_length();

-	}

-

-	return Variant();

-}

-void CollisionShapeSpatialGizmo::set_handle(int p_idx,Camera *p_camera, const Point2& p_point){

-	Ref<Shape> s = cs->get_shape();

-	if (s.is_null())

-		return;

-

-	Transform gt = cs->get_global_transform();

-	gt.orthonormalize();

-	Transform gi = gt.affine_inverse();

-

-	Vector3 ray_from = p_camera->project_ray_origin(p_point);

-	Vector3 ray_dir = p_camera->project_ray_normal(p_point);

-

-	Vector3 sg[2]={gi.xform(ray_from),gi.xform(ray_from+ray_dir*4096)};

-

-	if (s->cast_to<SphereShape>()) {

-

-		Ref<SphereShape> ss = s;

-		Vector3 ra,rb;

-		Geometry::get_closest_points_between_segments(Vector3(),Vector3(4096,0,0),sg[0],sg[1],ra,rb);

-		float d = ra.x;

-		if (d<0.001)

-			d=0.001;

-

-		ss->set_radius(d);

-	}

-

-	if (s->cast_to<RayShape>()) {

-

-		Ref<RayShape> rs = s;

-		Vector3 ra,rb;

-		Geometry::get_closest_points_between_segments(Vector3(),Vector3(0,0,4096),sg[0],sg[1],ra,rb);

-		float d = ra.z;

-		if (d<0.001)

-			d=0.001;

-

-		rs->set_length(d);

-	}

-

-

-	if (s->cast_to<BoxShape>()) {

-

-		Vector3 axis;

-		axis[p_idx]=1.0;

-		Ref<BoxShape> bs = s;

-		Vector3 ra,rb;

-		Geometry::get_closest_points_between_segments(Vector3(),axis*4096,sg[0],sg[1],ra,rb);

-		float d = ra[p_idx];

-		if (d<0.001)

-			d=0.001;

-

-		Vector3 he = bs->get_extents();

-		he[p_idx]=d;

-		bs->set_extents(he);

-

-	}

-

-	if (s->cast_to<CapsuleShape>()) {

-

-		Vector3 axis;

-		axis[p_idx==0?0:2]=1.0;

-		Ref<CapsuleShape> cs = s;

-		Vector3 ra,rb;

-		Geometry::get_closest_points_between_segments(Vector3(),axis*4096,sg[0],sg[1],ra,rb);

-		float d = axis.dot(ra);

-		if (p_idx==1)

-			d-=cs->get_radius();

-		if (d<0.001)

-			d=0.001;

-

-		if (p_idx==0)

-			cs->set_radius(d);

-		else if (p_idx==1)

-			cs->set_height(d*2.0);

-

-	}

-

-}

-void CollisionShapeSpatialGizmo::commit_handle(int p_idx,const Variant& p_restore,bool p_cancel){

-	Ref<Shape> s = cs->get_shape();

-	if (s.is_null())

-		return;

-

-	if (s->cast_to<SphereShape>()) {

-

-		Ref<SphereShape> ss=s;

-		if (p_cancel) {

-			ss->set_radius(p_restore);

-			return;

-		}

-

-		UndoRedo *ur = SpatialEditor::get_singleton()->get_undo_redo();

-		ur->create_action("Change Sphere Shape Radius");

-		ur->add_do_method(ss.ptr(),"set_radius",ss->get_radius());

-		ur->add_undo_method(ss.ptr(),"set_radius",p_restore);

-		ur->commit_action();

-

-	}

-

-	if (s->cast_to<BoxShape>()) {

-

-		Ref<BoxShape> ss=s;

-		if (p_cancel) {

-			ss->set_extents(p_restore);

-			return;

-		}

-

-		UndoRedo *ur = SpatialEditor::get_singleton()->get_undo_redo();

-		ur->create_action("Change Box Shape Extents");

-		ur->add_do_method(ss.ptr(),"set_extents",ss->get_extents());

-		ur->add_undo_method(ss.ptr(),"set_extents",p_restore);

-		ur->commit_action();

-	}

-

-	if (s->cast_to<CapsuleShape>()) {

-

-		Ref<CapsuleShape> ss=s;

-		if (p_cancel) {

-			if (p_idx==0)

-				ss->set_radius(p_restore);

-			else

-				ss->set_height(p_restore);

-			return;

-		}

-

-		UndoRedo *ur = SpatialEditor::get_singleton()->get_undo_redo();

-		if (p_idx==0) {

-			ur->create_action("Change Capsule Shape Radius");

-			ur->add_do_method(ss.ptr(),"set_radius",ss->get_radius());

-			ur->add_undo_method(ss.ptr(),"set_radius",p_restore);

-		} else {

-			ur->create_action("Change Capsule Shape Height");

-			ur->add_do_method(ss.ptr(),"set_height",ss->get_height());

-			ur->add_undo_method(ss.ptr(),"set_height",p_restore);

-

-		}

-

-		ur->commit_action();

-

-	}

-

-	if (s->cast_to<RayShape>()) {

-

-		Ref<RayShape> ss=s;

-		if (p_cancel) {

-			ss->set_length(p_restore);

-			return;

-		}

-

-		UndoRedo *ur = SpatialEditor::get_singleton()->get_undo_redo();

-		ur->create_action("Change Ray Shape Length");

-		ur->add_do_method(ss.ptr(),"set_length",ss->get_length());

-		ur->add_undo_method(ss.ptr(),"set_length",p_restore);

-		ur->commit_action();

-

-	}

-

-}

-void CollisionShapeSpatialGizmo::redraw(){

-

-	clear();

-

-	Ref<Shape> s = cs->get_shape();

-	if (s.is_null())

-		return;

-

-	if (s->cast_to<SphereShape>()) {

-

-		Ref<SphereShape> sp= s;

-		float r=sp->get_radius();

-

-		Vector<Vector3> points;

-

-		for(int i=0;i<=360;i++) {

-

-			float ra=Math::deg2rad(i);

-			float rb=Math::deg2rad(i+1);

-			Point2 a = Vector2(Math::sin(ra),Math::cos(ra))*r;

-			Point2 b = Vector2(Math::sin(rb),Math::cos(rb))*r;

-

-			points.push_back(Vector3(a.x,0,a.y));

-			points.push_back(Vector3(b.x,0,b.y));

-			points.push_back(Vector3(0,a.x,a.y));

-			points.push_back(Vector3(0,b.x,b.y));

-			points.push_back(Vector3(a.x,a.y,0));

-			points.push_back(Vector3(b.x,b.y,0));

-

-		}

-

-		Vector<Vector3> collision_segments;

-

-		for(int i=0;i<64;i++) {

-

-			float ra=i*Math_PI*2.0/64.0;

-			float rb=(i+1)*Math_PI*2.0/64.0;

-			Point2 a = Vector2(Math::sin(ra),Math::cos(ra))*r;

-			Point2 b = Vector2(Math::sin(rb),Math::cos(rb))*r;

-

-			collision_segments.push_back(Vector3(a.x,0,a.y));

-			collision_segments.push_back(Vector3(b.x,0,b.y));

-			collision_segments.push_back(Vector3(0,a.x,a.y));

-			collision_segments.push_back(Vector3(0,b.x,b.y));

-			collision_segments.push_back(Vector3(a.x,a.y,0));

-			collision_segments.push_back(Vector3(b.x,b.y,0));

-		}

-

-		add_lines(points,SpatialEditorGizmos::singleton->shape_material);

-		add_collision_segments(collision_segments);

-		Vector<Vector3> handles;

-		handles.push_back(Vector3(r,0,0));

-		add_handles(handles);

-

-	}

-

-	if (s->cast_to<BoxShape>()) {

-

-		Ref<BoxShape> bs=s;

-		Vector<Vector3> lines;

-		AABB aabb;

-		aabb.pos=-bs->get_extents();

-		aabb.size=aabb.pos*-2;

-

-		for(int i=0;i<12;i++) {

-			Vector3 a,b;

-			aabb.get_edge(i,a,b);

-			lines.push_back(a);

-			lines.push_back(b);

-		}

-

-		Vector<Vector3> handles;

-

-		for(int i=0;i<3;i++) {

-

-			Vector3 ax;

-			ax[i]=bs->get_extents()[i];

-			handles.push_back(ax);

-		}

-

-		add_lines(lines,SpatialEditorGizmos::singleton->shape_material);

-		add_collision_segments(lines);

-		add_handles(handles);

-

-	}

-

-	if (s->cast_to<CapsuleShape>()) {

-

-		Ref<CapsuleShape> cs=s;

-		float radius = cs->get_radius();

-		float height = cs->get_height();

-

-

-		Vector<Vector3> points;

-

-		Vector3 d(0,0,height*0.5);

-		for(int i=0;i<360;i++) {

-

-			float ra=Math::deg2rad(i);

-			float rb=Math::deg2rad(i+1);

-			Point2 a = Vector2(Math::sin(ra),Math::cos(ra))*radius;

-			Point2 b = Vector2(Math::sin(rb),Math::cos(rb))*radius;

-

-			points.push_back(Vector3(a.x,a.y,0)+d);

-			points.push_back(Vector3(b.x,b.y,0)+d);

-

-			points.push_back(Vector3(a.x,a.y,0)-d);

-			points.push_back(Vector3(b.x,b.y,0)-d);

-

-			if (i%90==0) {

-

-				points.push_back(Vector3(a.x,a.y,0)+d);

-				points.push_back(Vector3(a.x,a.y,0)-d);

-			}

-

-			Vector3 dud = i<180?d:-d;

-

-			points.push_back(Vector3(0,a.y,a.x)+dud);

-			points.push_back(Vector3(0,b.y,b.x)+dud);

-			points.push_back(Vector3(a.y,0,a.x)+dud);

-			points.push_back(Vector3(b.y,0,b.x)+dud);

-

-		}

-

-		add_lines(points,SpatialEditorGizmos::singleton->shape_material);

-

-		Vector<Vector3> collision_segments;

-

-		for(int i=0;i<64;i++) {

-

-			float ra=i*Math_PI*2.0/64.0;

-			float rb=(i+1)*Math_PI*2.0/64.0;

-			Point2 a = Vector2(Math::sin(ra),Math::cos(ra))*radius;

-			Point2 b = Vector2(Math::sin(rb),Math::cos(rb))*radius;

-

-			collision_segments.push_back(Vector3(a.x,a.y,0)+d);

-			collision_segments.push_back(Vector3(b.x,b.y,0)+d);

-

-			collision_segments.push_back(Vector3(a.x,a.y,0)-d);

-			collision_segments.push_back(Vector3(b.x,b.y,0)-d);

-

-			if (i%16==0) {

-

-				collision_segments.push_back(Vector3(a.x,a.y,0)+d);

-				collision_segments.push_back(Vector3(a.x,a.y,0)-d);

-			}

-

-			Vector3 dud = i<32?d:-d;

-

-			collision_segments.push_back(Vector3(0,a.y,a.x)+dud);

-			collision_segments.push_back(Vector3(0,b.y,b.x)+dud);

-			collision_segments.push_back(Vector3(a.y,0,a.x)+dud);

-			collision_segments.push_back(Vector3(b.y,0,b.x)+dud);

-

-		}

-

-		add_collision_segments(collision_segments);

-

-		Vector<Vector3> handles;

-		handles.push_back(Vector3(cs->get_radius(),0,0));

-		handles.push_back(Vector3(0,0,cs->get_height()*0.5+cs->get_radius()));

-		add_handles(handles);

-

-

-	}

-

-	if (s->cast_to<PlaneShape>()) {

-

-		Ref<PlaneShape> ps=s;

-		Plane p = ps->get_plane();

-		Vector<Vector3> points;

-

-		Vector3 n1 = p.get_any_perpendicular_normal();

-		Vector3 n2 = p.normal.cross(n1).normalized();

-

-		Vector3 pface[4]={

-			p.normal*p.d+n1*10.0+n2*10.0,

-			p.normal*p.d+n1*10.0+n2*-10.0,

-			p.normal*p.d+n1*-10.0+n2*-10.0,

-			p.normal*p.d+n1*-10.0+n2*10.0,

-		};

-

-		points.push_back(pface[0]);

-		points.push_back(pface[1]);

-		points.push_back(pface[1]);

-		points.push_back(pface[2]);

-		points.push_back(pface[2]);

-		points.push_back(pface[3]);

-		points.push_back(pface[3]);

-		points.push_back(pface[0]);

-		points.push_back(p.normal*p.d);

-		points.push_back(p.normal*p.d+p.normal*3);

-

-		add_lines(points,SpatialEditorGizmos::singleton->shape_material);

-		add_collision_segments(points);

-

-	}

-

-

-	if (s->cast_to<ConvexPolygonShape>()) {

-

-		DVector<Vector3> points = s->cast_to<ConvexPolygonShape>()->get_points();

-

-		if (points.size()>3) {

-

-			QuickHull qh;

-			Vector<Vector3> varr = Variant(points);

-			Geometry::MeshData md;

-			Error err = qh.build(varr,md);

-			if (err==OK) {

-				Vector<Vector3> points;

-				points.resize(md.edges.size()*2);

-				for(int i=0;i<md.edges.size();i++) {

-					points[i*2+0]=md.vertices[md.edges[i].a];

-					points[i*2+1]=md.vertices[md.edges[i].b];

-				}

-

-

-				add_lines(points,SpatialEditorGizmos::singleton->shape_material);

-				add_collision_segments(points);

-

-			}

-		}

-

-	}

-

-

-	if (s->cast_to<RayShape>()) {

-

-		Ref<RayShape> rs=s;

-

-		Vector<Vector3> points;

-		points.push_back(Vector3());

-		points.push_back(Vector3(0,0,rs->get_length()));

-		add_lines(points,SpatialEditorGizmos::singleton->shape_material);

-		add_collision_segments(points);

-		Vector<Vector3> handles;

-		handles.push_back(Vector3(0,0,rs->get_length()));

-		add_handles(handles);

-

-

-	}

-

-}

-CollisionShapeSpatialGizmo::CollisionShapeSpatialGizmo(CollisionShape* p_cs) {

-

-	cs=p_cs;

-	set_spatial_node(p_cs);

-}

-

-

-

-/////

-

-

-void CollisionPolygonSpatialGizmo::redraw() {

-

-	clear();

-

-	Vector<Vector2> points = polygon->get_polygon();

-	float depth = polygon->get_depth()*0.5;

-

-	Vector<Vector3> lines;

-	for(int i=0;i<points.size();i++) {

-

-		int n = (i+1)%points.size();

-		lines.push_back(Vector3(points[i].x,points[i].y,depth));

-		lines.push_back(Vector3(points[n].x,points[n].y,depth));

-		lines.push_back(Vector3(points[i].x,points[i].y,-depth));

-		lines.push_back(Vector3(points[n].x,points[n].y,-depth));

-		lines.push_back(Vector3(points[i].x,points[i].y,depth));

-		lines.push_back(Vector3(points[i].x,points[i].y,-depth));

-

-	}

-

-	add_lines(lines,SpatialEditorGizmos::singleton->shape_material);

-	add_collision_segments(lines);

-}

-

-CollisionPolygonSpatialGizmo::CollisionPolygonSpatialGizmo(CollisionPolygon* p_polygon){

-

-	set_spatial_node(p_polygon);

-	polygon=p_polygon;

-}

-///

-

-

-String VisibilityNotifierGizmo::get_handle_name(int p_idx) const {

-

-	switch(p_idx) {

-		case 0: return "X";

-		case 1: return "Y";

-		case 2: return "Z";

-	}

-

-	return "";

-}

-Variant VisibilityNotifierGizmo::get_handle_value(int p_idx) const{

-

-	return notifier->get_aabb();

-}

-void VisibilityNotifierGizmo::set_handle(int p_idx,Camera *p_camera, const Point2& p_point){

-

-

-	Transform gt = notifier->get_global_transform();

-	//gt.orthonormalize();

-	Transform gi = gt.affine_inverse();

-

-	AABB aabb = notifier->get_aabb();

-	Vector3 ray_from = p_camera->project_ray_origin(p_point);

-	Vector3 ray_dir = p_camera->project_ray_normal(p_point);

-

-	Vector3 sg[2]={gi.xform(ray_from),gi.xform(ray_from+ray_dir*4096)};

-	Vector3 ofs = aabb.pos+aabb.size*0.5;;

-

-	Vector3 axis;

-	axis[p_idx]=1.0;

-

-	Vector3 ra,rb;

-	Geometry::get_closest_points_between_segments(ofs,ofs+axis*4096,sg[0],sg[1],ra,rb);

-	float d = ra[p_idx];

-	if (d<0.001)

-		d=0.001;

-

-	Vector3 he = aabb.size;

-	aabb.pos[p_idx]=(aabb.pos[p_idx]+aabb.size[p_idx]*0.5)-d;

-	aabb.size[p_idx]=d*2;

-	notifier->set_aabb(aabb);

-}

-

-void VisibilityNotifierGizmo::commit_handle(int p_idx,const Variant& p_restore,bool p_cancel){

-

-

-	if (p_cancel) {

-		notifier->set_aabb(p_restore);

-		return;

-	}

-

-	UndoRedo *ur = SpatialEditor::get_singleton()->get_undo_redo();

-	ur->create_action("Change Notifier Extents");

-	ur->add_do_method(notifier,"set_aabb",notifier->get_aabb());

-	ur->add_undo_method(notifier,"set_aabb",p_restore);

-	ur->commit_action();

-

-}

-

-void VisibilityNotifierGizmo::redraw(){

-

-	clear();

-

-	Vector<Vector3> lines;

-	AABB aabb = notifier->get_aabb();

-

-	for(int i=0;i<12;i++) {

-		Vector3 a,b;

-		aabb.get_edge(i,a,b);

-		lines.push_back(a);

-		lines.push_back(b);

-	}

-

-	Vector<Vector3> handles;

-

-

-	for(int i=0;i<3;i++) {

-

-		Vector3 ax;

-		ax[i]=aabb.pos[i]+aabb.size[i];

-		handles.push_back(ax);

-	}

-

-	add_lines(lines,SpatialEditorGizmos::singleton->visibility_notifier_material);

-	//add_unscaled_billboard(SpatialEditorGizmos::singleton->visi,0.05);

-	add_collision_segments(lines);

-	add_handles(handles);

-

-}

-VisibilityNotifierGizmo::VisibilityNotifierGizmo(VisibilityNotifier* p_notifier){

-

-	notifier=p_notifier;

-	set_spatial_node(p_notifier);

-}

-

-////////

-

-

-

-void NavigationMeshSpatialGizmo::redraw() {

-

-	clear();

-	Ref<NavigationMesh> navmeshie = navmesh->get_navigation_mesh();

-	if (navmeshie.is_null())

-		return;

-

-	DVector<Vector3> vertices = navmeshie->get_vertices();

-	DVector<Vector3>::Read vr=vertices.read();

-	List<Face3> faces;

-	for(int i=0;i<navmeshie->get_polygon_count();i++) {

-		Vector<int> p = navmeshie->get_polygon(i);

-

-		for(int j=2;j<p.size();j++) {

-			Face3 f;

-			f.vertex[0]=vr[p[0]];

-			f.vertex[1]=vr[p[j-1]];

-			f.vertex[2]=vr[p[j]];

-

-			faces.push_back(f);

-		}

-	}

-

-

-	Map<_EdgeKey,bool> edge_map;

-	DVector<Vector3> tmeshfaces;

-	tmeshfaces.resize(faces.size()*3);

-

-	{

-		DVector<Vector3>::Write tw=tmeshfaces.write();

-		int tidx=0;

-

-

-		for(List<Face3>::Element *E=faces.front();E;E=E->next()) {

-

-			const Face3 &f = E->get();

-

-			for(int j=0;j<3;j++) {

-

-				tw[tidx++]=f.vertex[j];

-				_EdgeKey ek;

-				ek.from=f.vertex[j].snapped(CMP_EPSILON);

-				ek.to=f.vertex[(j+1)%3].snapped(CMP_EPSILON);

-				if (ek.from<ek.to)

-					SWAP(ek.from,ek.to);

-

-				Map<_EdgeKey,bool>::Element *E=edge_map.find(ek);

-

-				if (E) {

-

-					E->get()=false;

-

-				} else {

-

-					edge_map[ek]=true;

-				}

-

-			}

-		}

-	}

-	Vector<Vector3> lines;

-

-	for(Map<_EdgeKey,bool>::Element *E=edge_map.front();E;E=E->next()) {

-

-		if (E->get()) {

-			lines.push_back(E->key().from);

-			lines.push_back(E->key().to);

-		}

-	}

-

-	Ref<TriangleMesh> tmesh = memnew( TriangleMesh);

-	tmesh->create(tmeshfaces);

-

-	if (lines.size())

-		add_lines(lines,navmesh->is_enabled()?SpatialEditorGizmos::singleton->navmesh_edge_material:SpatialEditorGizmos::singleton->navmesh_edge_material_disabled);

-	add_collision_triangles(tmesh);

-	Ref<Mesh> m = memnew( Mesh );

-	Array a;

-	a.resize(Mesh::ARRAY_MAX);

-	a[0]=tmeshfaces;

-	m->add_surface(Mesh::PRIMITIVE_TRIANGLES,a);

-	m->surface_set_material(0,navmesh->is_enabled()?SpatialEditorGizmos::singleton->navmesh_solid_material:SpatialEditorGizmos::singleton->navmesh_solid_material_disabled);

-	add_mesh(m);

-	add_collision_segments(lines);

-

-}

-

-NavigationMeshSpatialGizmo::NavigationMeshSpatialGizmo(NavigationMeshInstance *p_navmesh){

-

-	set_spatial_node(p_navmesh);

-	navmesh=p_navmesh;

-}

-

-//////

-///

-///

-

-

-

-void PinJointSpatialGizmo::redraw() {

-

-	clear();

-	Vector<Vector3> cursor_points;

-	float cs = 0.25;

-	cursor_points.push_back(Vector3(+cs,0,0));

-	cursor_points.push_back(Vector3(-cs,0,0));

-	cursor_points.push_back(Vector3(0,+cs,0));

-	cursor_points.push_back(Vector3(0,-cs,0));

-	cursor_points.push_back(Vector3(0,0,+cs));

-	cursor_points.push_back(Vector3(0,0,-cs));

-	add_collision_segments(cursor_points);

-	add_lines(cursor_points,SpatialEditorGizmos::singleton->joint_material);

-

-}

-

-

-PinJointSpatialGizmo::PinJointSpatialGizmo(PinJoint* p_p3d) {

-

-	p3d=p_p3d;

-	set_spatial_node(p3d);

-}

-

-////

-

-void HingeJointSpatialGizmo::redraw() {

-

-	clear();

-	Vector<Vector3> cursor_points;

-	float cs = 0.25;

-	/*cursor_points.push_back(Vector3(+cs,0,0));

-	cursor_points.push_back(Vector3(-cs,0,0));

-	cursor_points.push_back(Vector3(0,+cs,0));

-	cursor_points.push_back(Vector3(0,-cs,0));*/

-	cursor_points.push_back(Vector3(0,0,+cs*2));

-	cursor_points.push_back(Vector3(0,0,-cs*2));

-

-	float ll = p3d->get_param(HingeJoint::PARAM_LIMIT_LOWER);

-	float ul = p3d->get_param(HingeJoint::PARAM_LIMIT_UPPER);

-

-	if (p3d->get_flag(HingeJoint::FLAG_USE_LIMIT) && ll<ul) {

-

-		const int points = 32;

-		float step = (ul-ll)/points;

-

-

-		for(int i=0;i<points;i++) {

-

-			float s = ll+i*(ul-ll)/points;

-			float n = ll+(i+1)*(ul-ll)/points;

-

-			Vector3 from=Vector3( -Math::sin(s),Math::cos(s), 0 )*cs;

-			Vector3 to=Vector3( -Math::sin(n),Math::cos(n), 0 )*cs;

-

-			if (i==points-1) {

-				cursor_points.push_back(to);

-				cursor_points.push_back(Vector3());

-			}

-			if (i==0) {

-				cursor_points.push_back(from);

-				cursor_points.push_back(Vector3());

-			}

-

-

-			cursor_points.push_back(from);

-			cursor_points.push_back(to);

-

-

-		}

-

-		cursor_points.push_back(Vector3(0,cs*1.5,0));

-		cursor_points.push_back(Vector3());

-

-	} else {

-

-

-		const int points = 32;

-

-		for(int i=0;i<points;i++) {

-

-			float s = ll+i*(Math_PI*2.0)/points;

-			float n = ll+(i+1)*(Math_PI*2.0)/points;

-

-			Vector3 from=Vector3( -Math::sin(s),Math::cos(s), 0 )*cs;

-			Vector3 to=Vector3( -Math::sin(n),Math::cos(n), 0 )*cs;

-

-			cursor_points.push_back(from);

-			cursor_points.push_back(to);

-

-		}

-

-	}

-	add_collision_segments(cursor_points);

-	add_lines(cursor_points,SpatialEditorGizmos::singleton->joint_material);

-

-}

-

-

-HingeJointSpatialGizmo::HingeJointSpatialGizmo(HingeJoint* p_p3d) {

-

-	p3d=p_p3d;

-	set_spatial_node(p3d);

-}

-

-///////

-///

-////

-

-void SliderJointSpatialGizmo::redraw() {

-

-	clear();

-	Vector<Vector3> cursor_points;

-	float cs = 0.25;

-	/*cursor_points.push_back(Vector3(+cs,0,0));

-	cursor_points.push_back(Vector3(-cs,0,0));

-	cursor_points.push_back(Vector3(0,+cs,0));

-	cursor_points.push_back(Vector3(0,-cs,0));*/

-	cursor_points.push_back(Vector3(0,0,+cs*2));

-	cursor_points.push_back(Vector3(0,0,-cs*2));

-

-	float ll = p3d->get_param(SliderJoint::PARAM_ANGULAR_LIMIT_LOWER);

-	float ul = p3d->get_param(SliderJoint::PARAM_ANGULAR_LIMIT_UPPER);

-	float lll = -p3d->get_param(SliderJoint::PARAM_LINEAR_LIMIT_LOWER);

-	float lul = -p3d->get_param(SliderJoint::PARAM_LINEAR_LIMIT_UPPER);

-

-	if (lll>lul) {

-

-		cursor_points.push_back(Vector3(lul,0,0));

-		cursor_points.push_back(Vector3(lll,0,0));

-

-		cursor_points.push_back(Vector3(lul,-cs,-cs));

-		cursor_points.push_back(Vector3(lul,-cs,cs));

-		cursor_points.push_back(Vector3(lul,-cs,cs));

-		cursor_points.push_back(Vector3(lul,cs,cs));

-		cursor_points.push_back(Vector3(lul,cs,cs));

-		cursor_points.push_back(Vector3(lul,cs,-cs));

-		cursor_points.push_back(Vector3(lul,cs,-cs));

-		cursor_points.push_back(Vector3(lul,-cs,-cs));

-

-

-		cursor_points.push_back(Vector3(lll,-cs,-cs));

-		cursor_points.push_back(Vector3(lll,-cs,cs));

-		cursor_points.push_back(Vector3(lll,-cs,cs));

-		cursor_points.push_back(Vector3(lll,cs,cs));

-		cursor_points.push_back(Vector3(lll,cs,cs));

-		cursor_points.push_back(Vector3(lll,cs,-cs));

-		cursor_points.push_back(Vector3(lll,cs,-cs));

-		cursor_points.push_back(Vector3(lll,-cs,-cs));

-

-

-	} else {

-

-		cursor_points.push_back(Vector3(+cs*2,0,0));

-		cursor_points.push_back(Vector3(-cs*2,0,0));

-

-	}

-

-	if (ll<ul) {

-

-		const int points = 32;

-		float step = (ul-ll)/points;

-

-

-		for(int i=0;i<points;i++) {

-

-			float s = ll+i*(ul-ll)/points;

-			float n = ll+(i+1)*(ul-ll)/points;

-

-			Vector3 from=Vector3(0, Math::cos(s), -Math::sin(s) )*cs;

-			Vector3 to=Vector3(0,Math::cos(n),  -Math::sin(n) )*cs;

-

-			if (i==points-1) {

-				cursor_points.push_back(to);

-				cursor_points.push_back(Vector3());

-			}

-			if (i==0) {

-				cursor_points.push_back(from);

-				cursor_points.push_back(Vector3());

-			}

-

-

-			cursor_points.push_back(from);

-			cursor_points.push_back(to);

-

-

-		}

-

-		cursor_points.push_back(Vector3(0,cs*1.5,0));

-		cursor_points.push_back(Vector3());

-

-	} else {

-

-

-		const int points = 32;

-

-		for(int i=0;i<points;i++) {

-

-			float s = ll+i*(Math_PI*2.0)/points;

-			float n = ll+(i+1)*(Math_PI*2.0)/points;

-

-			Vector3 from=Vector3(0,Math::cos(s),-Math::sin(s) )*cs;

-			Vector3 to=Vector3( 0,Math::cos(n),-Math::sin(n) )*cs;

-

-			cursor_points.push_back(from);

-			cursor_points.push_back(to);

-

-		}

-

-	}

-	add_collision_segments(cursor_points);

-	add_lines(cursor_points,SpatialEditorGizmos::singleton->joint_material);

-

-}

-

-

-SliderJointSpatialGizmo::SliderJointSpatialGizmo(SliderJoint* p_p3d) {

-

-	p3d=p_p3d;

-	set_spatial_node(p3d);

-}

-

-///////

-///

-////

-

-void ConeTwistJointSpatialGizmo::redraw() {

-

-	clear();

-	float cs = 0.25;

-	Vector<Vector3> points;

-

-	float r = 1.0;

-	float w = r*Math::sin(p3d->get_param(ConeTwistJoint::PARAM_SWING_SPAN));

-	float d = r*Math::cos(p3d->get_param(ConeTwistJoint::PARAM_SWING_SPAN));

-

-

-	//swing

-	for(int i=0;i<360;i+=10) {

-

-		float ra=Math::deg2rad(i);

-		float rb=Math::deg2rad(i+10);

-		Point2 a = Vector2(Math::sin(ra),Math::cos(ra))*w;

-		Point2 b = Vector2(Math::sin(rb),Math::cos(rb))*w;

-

-		/*points.push_back(Vector3(a.x,0,a.y));

-		points.push_back(Vector3(b.x,0,b.y));

-		points.push_back(Vector3(0,a.x,a.y));

-		points.push_back(Vector3(0,b.x,b.y));*/

-		points.push_back(Vector3(d,a.x,a.y));

-		points.push_back(Vector3(d,b.x,b.y));

-

-		if (i%90==0) {

-

-			points.push_back(Vector3(d,a.x,a.y));

-			points.push_back(Vector3());

-

-		}

-	}

-

-	points.push_back(Vector3());

-	points.push_back(Vector3(1,0,0));

-

-	//twist

-	/*

-	 */

-	float ts=Math::rad2deg(p3d->get_param(ConeTwistJoint::PARAM_TWIST_SPAN));

-	ts=MIN(ts,720);

-

-

-	for(int i=0;i<int(ts);i+=5) {

-

-		float ra=Math::deg2rad(i);

-		float rb=Math::deg2rad(i+5);

-		float c = i/720.0;

-		float cn = (i+5)/720.0;

-		Point2 a = Vector2(Math::sin(ra),Math::cos(ra))*w*c;

-		Point2 b = Vector2(Math::sin(rb),Math::cos(rb))*w*cn;

-

-		/*points.push_back(Vector3(a.x,0,a.y));

-		points.push_back(Vector3(b.x,0,b.y));

-		points.push_back(Vector3(0,a.x,a.y));

-		points.push_back(Vector3(0,b.x,b.y));*/

-

-		points.push_back(Vector3(c,a.x,a.y));

-		points.push_back(Vector3(cn,b.x,b.y));

-

-	}

-

-

-	add_collision_segments(points);

-	add_lines(points,SpatialEditorGizmos::singleton->joint_material);

-

-}

-

-

-ConeTwistJointSpatialGizmo::ConeTwistJointSpatialGizmo(ConeTwistJoint* p_p3d) {

-

-	p3d=p_p3d;

-	set_spatial_node(p3d);

-}

-

-////////

-/// \brief SpatialEditorGizmos::singleton

-///

-///////

-///

-////

-

-void Generic6DOFJointSpatialGizmo::redraw() {

-

-	clear();

-	Vector<Vector3> cursor_points;

-	float cs = 0.25;

-

-	for(int ax=0;ax<3;ax++) {

-		/*cursor_points.push_back(Vector3(+cs,0,0));

-		cursor_points.push_back(Vector3(-cs,0,0));

-		cursor_points.push_back(Vector3(0,+cs,0));

-		cursor_points.push_back(Vector3(0,-cs,0));

-		cursor_points.push_back(Vector3(0,0,+cs*2));

-		cursor_points.push_back(Vector3(0,0,-cs*2)); */

-

-		float ll;

-		float ul;

-		float lll;

-		float lul;

-

-		int a1,a2,a3;

-		bool enable_ang;

-		bool enable_lin;

-

-		switch(ax) {

-			case 0:

-				ll = p3d->get_param_x(Generic6DOFJoint::PARAM_ANGULAR_LOWER_LIMIT);

-				ul = p3d->get_param_x(Generic6DOFJoint::PARAM_ANGULAR_UPPER_LIMIT);

-				lll = -p3d->get_param_x(Generic6DOFJoint::PARAM_LINEAR_LOWER_LIMIT);

-				lul = -p3d->get_param_x(Generic6DOFJoint::PARAM_LINEAR_UPPER_LIMIT);

-				enable_ang = p3d->get_flag_x(Generic6DOFJoint::FLAG_ENABLE_ANGULAR_LIMIT);

-				enable_lin = p3d->get_flag_x(Generic6DOFJoint::FLAG_ENABLE_LINEAR_LIMIT);

-				a1=0;

-				a2=1;

-				a3=2;

-			break;

-			case 1:

-				ll = p3d->get_param_y(Generic6DOFJoint::PARAM_ANGULAR_LOWER_LIMIT);

-				ul = p3d->get_param_y(Generic6DOFJoint::PARAM_ANGULAR_UPPER_LIMIT);

-				lll = -p3d->get_param_y(Generic6DOFJoint::PARAM_LINEAR_LOWER_LIMIT);

-				lul = -p3d->get_param_y(Generic6DOFJoint::PARAM_LINEAR_UPPER_LIMIT);

-				enable_ang = p3d->get_flag_y(Generic6DOFJoint::FLAG_ENABLE_ANGULAR_LIMIT);

-				enable_lin = p3d->get_flag_y(Generic6DOFJoint::FLAG_ENABLE_LINEAR_LIMIT);

-				a1=2;

-				a2=0;

-				a3=1;

-			break;

-			case 2:

-				ll = p3d->get_param_z(Generic6DOFJoint::PARAM_ANGULAR_LOWER_LIMIT);

-				ul = p3d->get_param_z(Generic6DOFJoint::PARAM_ANGULAR_UPPER_LIMIT);

-				lll = -p3d->get_param_z(Generic6DOFJoint::PARAM_LINEAR_LOWER_LIMIT);

-				lul = -p3d->get_param_z(Generic6DOFJoint::PARAM_LINEAR_UPPER_LIMIT);

-				enable_ang = p3d->get_flag_z(Generic6DOFJoint::FLAG_ENABLE_ANGULAR_LIMIT);

-				enable_lin = p3d->get_flag_z(Generic6DOFJoint::FLAG_ENABLE_LINEAR_LIMIT);

-

-				a1=1;

-				a2=2;

-				a3=0;

-			break;

-		}

-

-#define ADD_VTX(x,y,z)\

-		{\

-			Vector3 v;\

-			v[a1]=(x);\

-			v[a2]=(y);\

-			v[a3]=(z);\

-			cursor_points.push_back(v);\

-		}

-

-#define SET_VTX(what,x,y,z)\

-		{\

-			Vector3 v;\

-			v[a1]=(x);\

-			v[a2]=(y);\

-			v[a3]=(z);\

-			what=v;\

-		}

-

-

-

-

-		if (enable_lin && lll>=lul) {

-

-			ADD_VTX(lul,0,0);

-			ADD_VTX(lll,0,0);

-

-			ADD_VTX(lul,-cs,-cs);

-			ADD_VTX(lul,-cs,cs);

-			ADD_VTX(lul,-cs,cs);

-			ADD_VTX(lul,cs,cs);

-			ADD_VTX(lul,cs,cs);

-			ADD_VTX(lul,cs,-cs);

-			ADD_VTX(lul,cs,-cs);

-			ADD_VTX(lul,-cs,-cs);

-

-

-			ADD_VTX(lll,-cs,-cs);

-			ADD_VTX(lll,-cs,cs);

-			ADD_VTX(lll,-cs,cs);

-			ADD_VTX(lll,cs,cs);

-			ADD_VTX(lll,cs,cs);

-			ADD_VTX(lll,cs,-cs);

-			ADD_VTX(lll,cs,-cs);

-			ADD_VTX(lll,-cs,-cs);

-

-

-		} else {

-

-			ADD_VTX(+cs*2,0,0);

-			ADD_VTX(-cs*2,0,0);

-

-		}

-

-		if (enable_ang && ll<=ul) {

-

-			const int points = 32;

-			float step = (ul-ll)/points;

-

-

-			for(int i=0;i<points;i++) {

-

-				float s = ll+i*(ul-ll)/points;

-				float n = ll+(i+1)*(ul-ll)/points;

-

-				Vector3 from;

-				SET_VTX(from,0, Math::cos(s), -Math::sin(s) );

-				from*=cs;

-				Vector3 to;

-				SET_VTX(to,0,Math::cos(n),  -Math::sin(n));

-				to*=cs;

-

-				if (i==points-1) {

-					cursor_points.push_back(to);

-					cursor_points.push_back(Vector3());

-				}

-				if (i==0) {

-					cursor_points.push_back(from);

-					cursor_points.push_back(Vector3());

-				}

-

-

-				cursor_points.push_back(from);

-				cursor_points.push_back(to);

-

-

-			}

-

-			ADD_VTX(0,cs*1.5,0);

-			cursor_points.push_back(Vector3());

-

-		} else {

-

-

-			const int points = 32;

-

-			for(int i=0;i<points;i++) {

-

-				float s = ll+i*(Math_PI*2.0)/points;

-				float n = ll+(i+1)*(Math_PI*2.0)/points;

-

-//				Vector3 from=Vector3(0,Math::cos(s),-Math::sin(s) )*cs;

-//				Vector3 to=Vector3( 0,Math::cos(n),-Math::sin(n) )*cs;

-

-				Vector3 from;

-				SET_VTX(from,0, Math::cos(s), -Math::sin(s) );

-				from*=cs;

-				Vector3 to;

-				SET_VTX(to,0,Math::cos(n),  -Math::sin(n));

-				to*=cs;

-

-				cursor_points.push_back(from);

-				cursor_points.push_back(to);

-

-			}

-

-		}

-	}

-

-#undef ADD_VTX

-#undef SET_VTX

-

-	add_collision_segments(cursor_points);

-	add_lines(cursor_points,SpatialEditorGizmos::singleton->joint_material);

-

-}

-

-

-Generic6DOFJointSpatialGizmo::Generic6DOFJointSpatialGizmo(Generic6DOFJoint* p_p3d) {

-

-	p3d=p_p3d;

-	set_spatial_node(p3d);

-}

-

-///////

-///

-////

-

-

-SpatialEditorGizmos *SpatialEditorGizmos::singleton=NULL;

-

-Ref<SpatialEditorGizmo> SpatialEditorGizmos::get_gizmo(Spatial *p_spatial) {

-

-	if (p_spatial->cast_to<Light>()) {

-

-		Ref<LightSpatialGizmo> lsg = memnew( LightSpatialGizmo(p_spatial->cast_to<Light>()) );

-		return lsg;

-	}

-

-	if (p_spatial->cast_to<Camera>()) {

-

-		Ref<CameraSpatialGizmo> lsg = memnew( CameraSpatialGizmo(p_spatial->cast_to<Camera>()) );

-		return lsg;

-	}

-

-	if (p_spatial->cast_to<Skeleton>()) {

-

-		Ref<SkeletonSpatialGizmo> lsg = memnew( SkeletonSpatialGizmo(p_spatial->cast_to<Skeleton>()) );

-		return lsg;

-	}

-

-

-	if (p_spatial->cast_to<Position3D>()) {

-

-		Ref<Position3DSpatialGizmo> lsg = memnew( Position3DSpatialGizmo(p_spatial->cast_to<Position3D>()) );

-		return lsg;

-	}

-

-	if (p_spatial->cast_to<MeshInstance>()) {

-

-		Ref<MeshInstanceSpatialGizmo> misg = memnew( MeshInstanceSpatialGizmo(p_spatial->cast_to<MeshInstance>()) );

-		return misg;

-	}

-

-	if (p_spatial->cast_to<Room>()) {

-

-		Ref<RoomSpatialGizmo> misg = memnew( RoomSpatialGizmo(p_spatial->cast_to<Room>()) );

-		return misg;

-	}

-

-	if (p_spatial->cast_to<NavigationMeshInstance>()) {

-

-		Ref<NavigationMeshSpatialGizmo> misg = memnew( NavigationMeshSpatialGizmo(p_spatial->cast_to<NavigationMeshInstance>()) );

-		return misg;

-	}

-

-	if (p_spatial->cast_to<RayCast>()) {

-

-		Ref<RayCastSpatialGizmo> misg = memnew( RayCastSpatialGizmo(p_spatial->cast_to<RayCast>()) );

-		return misg;

-	}

-

-	if (p_spatial->cast_to<Portal>()) {

-

-		Ref<PortalSpatialGizmo> misg = memnew( PortalSpatialGizmo(p_spatial->cast_to<Portal>()) );

-		return misg;

-	}

-

-

-	if (p_spatial->cast_to<TestCube>()) {

-

-		Ref<TestCubeSpatialGizmo> misg = memnew( TestCubeSpatialGizmo(p_spatial->cast_to<TestCube>()) );

-		return misg;

-	}

-

-	if (p_spatial->cast_to<SpatialPlayer>()) {

-

-		Ref<SpatialPlayerSpatialGizmo> misg = memnew( SpatialPlayerSpatialGizmo(p_spatial->cast_to<SpatialPlayer>()) );

-		return misg;

-	}

-

-	if (p_spatial->cast_to<CollisionShape>()) {

-

-		Ref<CollisionShapeSpatialGizmo> misg = memnew( CollisionShapeSpatialGizmo(p_spatial->cast_to<CollisionShape>()) );

-		return misg;

-	}

-

-	if (p_spatial->cast_to<VisibilityNotifier>()) {

-

-		Ref<VisibilityNotifierGizmo> misg = memnew( VisibilityNotifierGizmo(p_spatial->cast_to<VisibilityNotifier>()) );

-		return misg;

-	}

-

-	if (p_spatial->cast_to<VehicleWheel>()) {

-

-		Ref<VehicleWheelSpatialGizmo> misg = memnew( VehicleWheelSpatialGizmo(p_spatial->cast_to<VehicleWheel>()) );

-		return misg;

-	}

-	if (p_spatial->cast_to<PinJoint>()) {

-

-		Ref<PinJointSpatialGizmo> misg = memnew( PinJointSpatialGizmo(p_spatial->cast_to<PinJoint>()) );

-		return misg;

-	}

-

-	if (p_spatial->cast_to<HingeJoint>()) {

-

-		Ref<HingeJointSpatialGizmo> misg = memnew( HingeJointSpatialGizmo(p_spatial->cast_to<HingeJoint>()) );

-		return misg;

-	}

-

-	if (p_spatial->cast_to<SliderJoint>()) {

-

-		Ref<SliderJointSpatialGizmo> misg = memnew( SliderJointSpatialGizmo(p_spatial->cast_to<SliderJoint>()) );

-		return misg;

-	}

-

-	if (p_spatial->cast_to<ConeTwistJoint>()) {

-

-		Ref<ConeTwistJointSpatialGizmo> misg = memnew( ConeTwistJointSpatialGizmo(p_spatial->cast_to<ConeTwistJoint>()) );

-		return misg;

-	}

-

-	if (p_spatial->cast_to<Generic6DOFJoint>()) {

-

-		Ref<Generic6DOFJointSpatialGizmo> misg = memnew( Generic6DOFJointSpatialGizmo(p_spatial->cast_to<Generic6DOFJoint>()) );

-		return misg;

-	}

-

-	if (p_spatial->cast_to<CollisionPolygon>()) {

-

-		Ref<CollisionPolygonSpatialGizmo> misg = memnew( CollisionPolygonSpatialGizmo(p_spatial->cast_to<CollisionPolygon>()) );

-		return misg;

-	}

-

-

-	return Ref<SpatialEditorGizmo>();

-}

-

-

-Ref<FixedMaterial> SpatialEditorGizmos::create_line_material(const Color& p_base_color) {

-

-	Ref<FixedMaterial> line_material = Ref<FixedMaterial>( memnew( FixedMaterial ));

-	line_material->set_flag(Material::FLAG_UNSHADED, true);

-	line_material->set_line_width(3.0);

-	line_material->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA, true);

-	line_material->set_fixed_flag(FixedMaterial::FLAG_USE_COLOR_ARRAY, true);

-	line_material->set_parameter(FixedMaterial::PARAM_DIFFUSE,p_base_color);

-

-	return line_material;

-

-}

-

-Ref<FixedMaterial> SpatialEditorGizmos::create_solid_material(const Color& p_base_color) {

-

-	Ref<FixedMaterial> line_material = Ref<FixedMaterial>( memnew( FixedMaterial ));

-	line_material->set_flag(Material::FLAG_UNSHADED, true);

-	line_material->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA, true);

-	line_material->set_parameter(FixedMaterial::PARAM_DIFFUSE,p_base_color);

-

-	return line_material;

-

-}

-

-SpatialEditorGizmos::SpatialEditorGizmos() {

-

-	singleton=this;

-

-	handle_material = Ref<FixedMaterial>( memnew( FixedMaterial ));

-	handle_material->set_flag(Material::FLAG_UNSHADED, true);

-	handle_material->set_parameter(FixedMaterial::PARAM_DIFFUSE,Color(0.8,0.8,0.8));

-

-	handle2_material = Ref<FixedMaterial>( memnew( FixedMaterial ));

-	handle2_material->set_flag(Material::FLAG_UNSHADED, true);

-	handle2_material->set_fixed_flag(FixedMaterial::FLAG_USE_POINT_SIZE, true);

-	handle_t = SpatialEditor::get_singleton()->get_icon("Editor3DHandle","EditorIcons");

-	handle2_material->set_point_size(handle_t->get_width());

-	handle2_material->set_texture(FixedMaterial::PARAM_DIFFUSE,handle_t);

-	handle2_material->set_parameter(FixedMaterial::PARAM_DIFFUSE,Color(1,1,1));

-	handle2_material->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA, true);

-	handle2_material->set_fixed_flag(FixedMaterial::FLAG_USE_COLOR_ARRAY, true);

-

-	light_material = create_line_material(Color(1,1,0.2));

-

-	light_material_omni_icon = Ref<FixedMaterial>( memnew( FixedMaterial ));

-	light_material_omni_icon->set_flag(Material::FLAG_UNSHADED, true);

-	light_material_omni_icon->set_flag(Material::FLAG_DOUBLE_SIDED, true);

-	light_material_omni_icon->set_depth_draw_mode(Material::DEPTH_DRAW_NEVER);

-	light_material_omni_icon->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA, true);

-	light_material_omni_icon->set_parameter(FixedMaterial::PARAM_DIFFUSE,Color(1,1,1,0.9));

-	light_material_omni_icon->set_texture(FixedMaterial::PARAM_DIFFUSE,SpatialEditor::get_singleton()->get_icon("GizmoLight","EditorIcons"));

-

-

-	light_material_directional_icon = Ref<FixedMaterial>( memnew( FixedMaterial ));

-	light_material_directional_icon->set_flag(Material::FLAG_UNSHADED, true);

-	light_material_directional_icon->set_flag(Material::FLAG_DOUBLE_SIDED, true);

-	light_material_directional_icon->set_depth_draw_mode(Material::DEPTH_DRAW_NEVER);

-	light_material_directional_icon->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA, true);

-	light_material_directional_icon->set_parameter(FixedMaterial::PARAM_DIFFUSE,Color(1,1,1,0.9));

-	light_material_directional_icon->set_texture(FixedMaterial::PARAM_DIFFUSE,SpatialEditor::get_singleton()->get_icon("GizmoDirectionalLight","EditorIcons"));

-

-	camera_material = create_line_material(Color(1.0,0.5,1.0));

-

-

-	navmesh_edge_material = create_line_material(Color(0.1,0.8,1.0));

-	navmesh_solid_material = create_solid_material(Color(0.1,0.8,1.0,0.4));

-	navmesh_edge_material->set_fixed_flag(FixedMaterial::FLAG_USE_COLOR_ARRAY, false);

-	navmesh_solid_material->set_flag(Material::FLAG_DOUBLE_SIDED,true);

-

-	navmesh_edge_material_disabled = create_line_material(Color(1.0,0.8,0.1));

-	navmesh_solid_material_disabled = create_solid_material(Color(1.0,0.8,0.1,0.4));

-	navmesh_edge_material_disabled->set_fixed_flag(FixedMaterial::FLAG_USE_COLOR_ARRAY, false);

-	navmesh_solid_material_disabled->set_flag(Material::FLAG_DOUBLE_SIDED,true);

-

-	skeleton_material = create_line_material(Color(0.6,1.0,0.3));

-	skeleton_material->set_flag(Material::FLAG_DOUBLE_SIDED,true);

-	skeleton_material->set_flag(Material::FLAG_UNSHADED,true);

-	skeleton_material->set_flag(Material::FLAG_ONTOP,true);

-	skeleton_material->set_depth_draw_mode(Material::DEPTH_DRAW_NEVER);

-

-	//position 3D Shared mesh

-

-	pos3d_mesh = Ref<Mesh>( memnew( Mesh ) );

-	{

-

-		DVector<Vector3> cursor_points;

-		DVector<Color> cursor_colors;

-		float cs = 0.25;

-		cursor_points.push_back(Vector3(+cs,0,0));

-		cursor_points.push_back(Vector3(-cs,0,0));

-		cursor_points.push_back(Vector3(0,+cs,0));

-		cursor_points.push_back(Vector3(0,-cs,0));

-		cursor_points.push_back(Vector3(0,0,+cs));

-		cursor_points.push_back(Vector3(0,0,-cs));

-		cursor_colors.push_back(Color(1,0.5,0.5,0.7));

-		cursor_colors.push_back(Color(1,0.5,0.5,0.7));

-		cursor_colors.push_back(Color(0.5,1,0.5,0.7));

-		cursor_colors.push_back(Color(0.5,1,0.5,0.7));

-		cursor_colors.push_back(Color(0.5,0.5,1,0.7));

-		cursor_colors.push_back(Color(0.5,0.5,1,0.7));

-

-		Ref<FixedMaterial> mat = memnew( FixedMaterial );

-		mat->set_flag(Material::FLAG_UNSHADED,true);

-		mat->set_fixed_flag(FixedMaterial::FLAG_USE_COLOR_ARRAY,true);

-		mat->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA,true);

-		mat->set_line_width(3);

-		Array d;

-		d.resize(VS::ARRAY_MAX);

-		d[Mesh::ARRAY_VERTEX]=cursor_points;

-		d[Mesh::ARRAY_COLOR]=cursor_colors;

-		pos3d_mesh->add_surface(Mesh::PRIMITIVE_LINES,d);

-		pos3d_mesh->surface_set_material(0,mat);

-	}

-

-

-	sample_player_icon = Ref<FixedMaterial>( memnew( FixedMaterial ));

-	sample_player_icon->set_flag(Material::FLAG_UNSHADED, true);

-	sample_player_icon->set_flag(Material::FLAG_DOUBLE_SIDED, true);

-	sample_player_icon->set_depth_draw_mode(Material::DEPTH_DRAW_NEVER);

-	sample_player_icon->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA, true);

-	sample_player_icon->set_parameter(FixedMaterial::PARAM_DIFFUSE,Color(1,1,1,0.9));

-	sample_player_icon->set_texture(FixedMaterial::PARAM_DIFFUSE,SpatialEditor::get_singleton()->get_icon("GizmoSpatialSamplePlayer","EditorIcons"));

-

-	room_material = create_line_material(Color(1.0,0.6,0.9));

-	portal_material = create_line_material(Color(1.0,0.8,0.6));

-	raycast_material = create_line_material(Color(1.0,0.8,0.6));

-	car_wheel_material = create_line_material(Color(0.6,0.8,1.0));

-	visibility_notifier_material = create_line_material(Color(1.0,0.5,1.0));

-	joint_material = create_line_material(Color(0.6,0.8,1.0));

-

-	stream_player_icon = Ref<FixedMaterial>( memnew( FixedMaterial ));

-	stream_player_icon->set_flag(Material::FLAG_UNSHADED, true);

-	stream_player_icon->set_flag(Material::FLAG_DOUBLE_SIDED, true);

-	stream_player_icon->set_depth_draw_mode(Material::DEPTH_DRAW_NEVER);

-	stream_player_icon->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA, true);

-	stream_player_icon->set_parameter(FixedMaterial::PARAM_DIFFUSE,Color(1,1,1,0.9));

-	stream_player_icon->set_texture(FixedMaterial::PARAM_DIFFUSE,SpatialEditor::get_singleton()->get_icon("GizmoSpatialStreamPlayer","EditorIcons"));

-

-	visibility_notifier_icon = Ref<FixedMaterial>( memnew( FixedMaterial ));

-	visibility_notifier_icon->set_flag(Material::FLAG_UNSHADED, true);

-	visibility_notifier_icon->set_flag(Material::FLAG_DOUBLE_SIDED, true);

-	visibility_notifier_icon->set_depth_draw_mode(Material::DEPTH_DRAW_NEVER);

-	visibility_notifier_icon->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA, true);

-	visibility_notifier_icon->set_parameter(FixedMaterial::PARAM_DIFFUSE,Color(1,1,1,0.9));

-	visibility_notifier_icon->set_texture(FixedMaterial::PARAM_DIFFUSE,SpatialEditor::get_singleton()->get_icon("Visible","EditorIcons"));

-

-	{

-

-		DVector<Vector3> vertices;

-

-#undef ADD_VTX

-#define ADD_VTX(m_idx);\

-	vertices.push_back( face_points[m_idx] );

-

-		for (int i=0;i<6;i++) {

-

-

-			Vector3 face_points[4];

-

-			for (int j=0;j<4;j++) {

-

-				float v[3];

-				v[0]=1.0;

-				v[1]=1-2*((j>>1)&1);

-				v[2]=v[1]*(1-2*(j&1));

-

-				for (int k=0;k<3;k++) {

-

-					if (i<3)

-						face_points[j][(i+k)%3]=v[k]*(i>=3?-1:1);

-					else

-						face_points[3-j][(i+k)%3]=v[k]*(i>=3?-1:1);

-				}

-			}

-			//tri 1

-			ADD_VTX(0);

-			ADD_VTX(1);

-			ADD_VTX(2);

-			//tri 2

-			ADD_VTX(2);

-			ADD_VTX(3);

-			ADD_VTX(0);

-

-		}

-

-		test_cube_tm = Ref<TriangleMesh>( memnew( TriangleMesh ) );

-		test_cube_tm->create(vertices);

-	}

-

-	shape_material = create_line_material(Color(0.2,1,1.0));

-

-

-}

-

+/*************************************************************************/
+/*  spatial_editor_gizmos.cpp                                            */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+#include "spatial_editor_gizmos.h"
+#include "geometry.h"
+#include "scene/3d/camera.h"
+#include "scene/resources/surface_tool.h"
+#include "scene/resources/sphere_shape.h"
+#include "scene/resources/box_shape.h"
+#include "scene/resources/capsule_shape.h"
+#include "scene/resources/ray_shape.h"
+#include "scene/resources/convex_polygon_shape.h"
+#include "scene/resources/plane_shape.h"
+#include "quick_hull.h"
+
+// Keep small children away from this file.
+// It's so ugly it will eat them alive
+
+#define HANDLE_HALF_SIZE 0.05
+
+void SpatialGizmoTool::clear() {
+
+	for(int i=0;i<instances.size();i++) {
+
+		if (instances[i].instance.is_valid())
+			VS::get_singleton()->free(instances[i].instance);
+
+
+	}
+
+	billboard_handle=false;
+	collision_segments.clear();
+	collision_mesh=Ref<TriangleMesh>();
+	instances.clear();
+	handles.clear();
+	secondary_handles.clear();
+}
+
+void SpatialGizmoTool::Instance::create_instance(Spatial *p_base) {
+
+	instance = VS::get_singleton()->instance_create2(mesh->get_rid(),p_base->get_world()->get_scenario());
+	VS::get_singleton()->instance_attach_object_instance_ID(instance,p_base->get_instance_ID());
+	if (billboard)
+		VS::get_singleton()->instance_geometry_set_flag(instance,VS::INSTANCE_FLAG_BILLBOARD,true);
+	if (unscaled)
+		VS::get_singleton()->instance_geometry_set_flag(instance,VS::INSTANCE_FLAG_DEPH_SCALE,true);
+	if (skeleton.is_valid())
+		VS::get_singleton()->instance_attach_skeleton(instance,skeleton);
+	if (extra_margin)
+		VS::get_singleton()->instance_set_extra_visibility_margin(instance,1);
+	VS::get_singleton()->instance_geometry_set_flag(instance,VS::INSTANCE_FLAG_CAST_SHADOW,false);
+	VS::get_singleton()->instance_geometry_set_flag(instance,VS::INSTANCE_FLAG_RECEIVE_SHADOWS,false);
+	VS::get_singleton()->instance_set_layer_mask(instance,1<<SpatialEditorViewport::GIZMO_EDIT_LAYER); //gizmos are 26
+}
+
+
+
+void SpatialGizmoTool::add_mesh(const Ref<Mesh>& p_mesh,bool p_billboard, const RID &p_skeleton) {
+
+	ERR_FAIL_COND(!spatial_node);
+	Instance ins;
+
+	ins.billboard=p_billboard;
+	ins.mesh=p_mesh;
+	ins.skeleton=p_skeleton;
+	if (valid) {
+		ins.create_instance(spatial_node);
+		VS::get_singleton()->instance_set_transform(ins.instance,spatial_node->get_global_transform());
+	}
+
+	instances.push_back(ins);
+
+}
+
+void SpatialGizmoTool::add_lines(const Vector<Vector3> &p_lines, const Ref<Material> &p_material,bool p_billboard){
+
+	ERR_FAIL_COND(!spatial_node);
+	Instance ins;
+
+	Ref<Mesh> mesh = memnew( Mesh );
+	Array a;
+	a.resize(Mesh::ARRAY_MAX);
+
+	a[Mesh::ARRAY_VERTEX]=p_lines;
+
+	DVector<Color> color;
+	color.resize(p_lines.size());
+	{
+		DVector<Color>::Write w = color.write();
+		for(int i=0;i<p_lines.size();i++) {
+			if (is_selected())
+				w[i]=Color(1,1,1,0.6);
+			else
+				w[i]=Color(1,1,1,0.25);
+		}
+
+	}
+
+	a[Mesh::ARRAY_COLOR]=color;
+
+
+	mesh->add_surface(Mesh::PRIMITIVE_LINES,a);
+	mesh->surface_set_material(0,p_material);
+
+	if (p_billboard) {
+		float md=0;
+		for(int i=0;i<p_lines.size();i++) {
+
+			md=MAX(0,p_lines[i].length());
+
+		}
+		if (md) {
+			mesh->set_custom_aabb(AABB(Vector3(-md,-md,-md),Vector3(md,md,md)*2.0));
+		}
+	}
+
+	ins.billboard=p_billboard;
+	ins.mesh=mesh;
+	if (valid) {
+		ins.create_instance(spatial_node);
+		VS::get_singleton()->instance_set_transform(ins.instance,spatial_node->get_global_transform());
+	}
+
+	instances.push_back(ins);
+
+}
+
+void SpatialGizmoTool::add_unscaled_billboard(const Ref<Material>& p_material,float p_scale) {
+
+	ERR_FAIL_COND(!spatial_node);
+	Instance ins;
+
+	Vector<Vector3 > vs;
+	Vector<Vector2 > uv;
+
+	vs.push_back(Vector3(-p_scale,p_scale,0));
+	vs.push_back(Vector3(p_scale,p_scale,0));
+	vs.push_back(Vector3(p_scale,-p_scale,0));
+	vs.push_back(Vector3(-p_scale,-p_scale,0));
+
+	uv.push_back(Vector2(1,0));
+	uv.push_back(Vector2(0,0));
+	uv.push_back(Vector2(0,1));
+	uv.push_back(Vector2(1,1));
+
+	Ref<Mesh> mesh = memnew( Mesh );
+	Array a;
+	a.resize(Mesh::ARRAY_MAX);
+	a[Mesh::ARRAY_VERTEX]=vs;
+	a[Mesh::ARRAY_TEX_UV]=uv;
+	mesh->add_surface(Mesh::PRIMITIVE_TRIANGLE_FAN,a);
+	mesh->surface_set_material(0,p_material);
+
+	if (true) {
+		float md=0;
+		for(int i=0;i<vs.size();i++) {
+
+			md=MAX(0,vs[i].length());
+
+		}
+		if (md) {
+			mesh->set_custom_aabb(AABB(Vector3(-md,-md,-md),Vector3(md,md,md)*2.0));
+		}
+	}
+
+	ins.mesh=mesh;
+	ins.unscaled=true;
+	ins.billboard=true;
+	if (valid) {
+		ins.create_instance(spatial_node);
+		VS::get_singleton()->instance_set_transform(ins.instance,spatial_node->get_global_transform());
+	}
+
+	instances.push_back(ins);
+
+
+}
+
+void SpatialGizmoTool::add_collision_triangles(const Ref<TriangleMesh>& p_tmesh) {
+
+	collision_mesh=p_tmesh;
+}
+
+void SpatialGizmoTool::add_collision_segments(const Vector<Vector3> &p_lines) {
+
+	int from=collision_segments.size();
+	collision_segments.resize(from+p_lines.size());
+	for(int i=0;i<p_lines.size();i++) {
+
+		collision_segments[from+i]=p_lines[i];
+	}
+}
+
+
+void SpatialGizmoTool::add_handles(const Vector<Vector3> &p_handles, bool p_billboard,bool p_secondary){
+
+	billboard_handle=p_billboard;
+
+	if (!is_selected())
+		return;
+
+	ERR_FAIL_COND(!spatial_node);
+
+	ERR_FAIL_COND(!spatial_node);
+	Instance ins;
+
+
+	Ref<Mesh> mesh = memnew( Mesh );
+#if 1
+
+	Array a;
+	a.resize(VS::ARRAY_MAX);
+	a[VS::ARRAY_VERTEX]=p_handles;
+	DVector<Color> colors;
+	{
+		colors.resize(p_handles.size());
+		DVector<Color>::Write w=colors.write();
+		for(int i=0;i<p_handles.size();i++) {
+
+			Color col(1,1,1,1);
+			if (SpatialEditor::get_singleton()->get_over_gizmo_handle()!=i)
+				col=Color(0.9,0.9,0.9,0.9);
+			w[i]=col;
+		}
+
+	}
+	a[VS::ARRAY_COLOR]=colors;
+	mesh->add_surface(Mesh::PRIMITIVE_POINTS,a);
+	mesh->surface_set_material(0,SpatialEditorGizmos::singleton->handle2_material);
+
+	if (p_billboard) {
+		float md=0;
+		for(int i=0;i<p_handles.size();i++) {
+
+			md=MAX(0,p_handles[i].length());
+
+		}
+		if (md) {
+			mesh->set_custom_aabb(AABB(Vector3(-md,-md,-md),Vector3(md,md,md)*2.0));
+		}
+	}
+
+
+
+#else
+	for(int ih=0;ih<p_handles.size();ih++) {
+
+
+		Vector<Vector3> vertices;
+		Vector<Vector3> normals;
+
+		int vtx_idx=0;
+#define ADD_VTX(m_idx);\
+	vertices.push_back( (face_points[m_idx]*HANDLE_HALF_SIZE+p_handles[ih]) );\
+	normals.push_back( normal_points[m_idx] );\
+	vtx_idx++;\
+
+		for (int i=0;i<6;i++) {
+
+
+			Vector3 face_points[4];
+			Vector3 normal_points[4];
+			float uv_points[8]={0,0,0,1,1,1,1,0};
+
+			for (int j=0;j<4;j++) {
+
+				float v[3];
+				v[0]=1.0;
+				v[1]=1-2*((j>>1)&1);
+				v[2]=v[1]*(1-2*(j&1));
+
+				for (int k=0;k<3;k++) {
+
+					if (i<3)
+						face_points[j][(i+k)%3]=v[k]*(i>=3?-1:1);
+					else
+						face_points[3-j][(i+k)%3]=v[k]*(i>=3?-1:1);
+				}
+				normal_points[j]=Vector3();
+				normal_points[j][i%3]=(i>=3?-1:1);
+			}
+			//tri 1
+			ADD_VTX(0);
+			ADD_VTX(1);
+			ADD_VTX(2);
+			//tri 2
+			ADD_VTX(2);
+			ADD_VTX(3);
+			ADD_VTX(0);
+
+		}
+
+
+		Array d;
+		d.resize(VS::ARRAY_MAX);
+		d[VisualServer::ARRAY_NORMAL]= normals ;
+		d[VisualServer::ARRAY_VERTEX]= vertices ;
+
+		mesh->add_surface(Mesh::PRIMITIVE_TRIANGLES,d);
+		mesh->surface_set_material(ih,SpatialEditorGizmos::singleton->handle_material);
+
+
+	}
+#endif
+	ins.mesh=mesh;
+	ins.billboard=p_billboard;
+	ins.extra_margin=true;
+	if (valid) {
+		ins.create_instance(spatial_node);
+		VS::get_singleton()->instance_set_transform(ins.instance,spatial_node->get_global_transform());
+	}
+	instances.push_back(ins);
+	if (!p_secondary) {
+		int chs=handles.size();
+		handles.resize(chs+p_handles.size());
+		for(int i=0;i<p_handles.size();i++) {
+			handles[i+chs]=p_handles[i];
+		}
+	} else {
+
+		int chs=secondary_handles.size();
+		secondary_handles.resize(chs+p_handles.size());
+		for(int i=0;i<p_handles.size();i++) {
+			secondary_handles[i+chs]=p_handles[i];
+		}
+
+	}
+
+}
+
+
+void SpatialGizmoTool::set_spatial_node(Spatial *p_node){
+
+	spatial_node=p_node;
+
+}
+
+bool SpatialGizmoTool::intersect_frustum(const Camera *p_camera,const Vector<Plane> &p_frustum) {
+
+	ERR_FAIL_COND_V(!spatial_node,false);
+	ERR_FAIL_COND_V(!valid,false);
+
+	if (collision_segments.size()) {
+
+		const Plane *p=p_frustum.ptr();
+		int fc=p_frustum.size();
+
+		int vc=collision_segments.size();
+		const Vector3* vptr=collision_segments.ptr();
+		Transform t = spatial_node->get_global_transform();
+
+		for(int i=0;i<vc/2;i++) {
+
+
+			Vector3 a=t.xform(vptr[i*2+0]);
+			Vector3 b=t.xform(vptr[i*2+1]);
+
+			bool any_out=false;
+			for(int j=0;j<fc;j++) {
+
+				if (p[j].distance_to(a) > 0 && p[j].distance_to(b) >0) {
+
+					any_out=true;
+					break;
+				}
+			}
+
+			if (!any_out)
+				return true;
+		}
+
+		return false;
+	}
+
+	return false;
+}
+
+
+bool SpatialGizmoTool::intersect_ray(const Camera *p_camera,const Point2& p_point,  Vector3& r_pos, Vector3& r_normal,int *r_gizmo_handle,bool p_sec_first) {
+
+	ERR_FAIL_COND_V(!spatial_node,false);
+	ERR_FAIL_COND_V(!valid,false);
+
+	if (r_gizmo_handle) {
+
+		Transform t = spatial_node->get_global_transform();
+		t.orthonormalize();
+		if (billboard_handle) {
+			t.set_look_at(t.origin,t.origin+p_camera->get_transform().basis.get_axis(2),p_camera->get_transform().basis.get_axis(1));
+		}
+		Transform ti=t.affine_inverse();
+
+		Vector3 ray_from=ti.xform(p_camera->project_ray_origin(p_point));
+		Vector3 ray_dir=t.basis.xform_inv(p_camera->project_ray_normal(p_point)).normalized();
+		Vector3 ray_to = ray_from+ray_dir*4096;
+
+		float min_d=1e20;
+		int idx=-1;
+
+		for(int i=0;i<secondary_handles.size();i++) {
+#if 1
+
+
+			Vector3 hpos = t.xform(secondary_handles[i]);
+			Vector2 p = p_camera->unproject_position(hpos);
+			if (p.distance_to(p_point)<SpatialEditorGizmos::singleton->handle_t->get_width()*0.6) {
+
+
+				real_t dp = p_camera->get_transform().origin.distance_to(hpos);
+				if (dp<min_d) {
+
+					r_pos=t.xform(hpos);
+					r_normal=p_camera->get_transform().basis.get_axis(2);
+					min_d=dp;
+					idx=i+handles.size();
+
+				}
+
+			}
+
+#else
+			AABB aabb;
+			aabb.pos=Vector3(-1,-1,-1)*HANDLE_HALF_SIZE;
+			aabb.size=aabb.pos*-2;
+			aabb.pos+=secondary_handles[i];
+
+
+			Vector3 rpos,rnorm;
+
+			if (aabb.intersects_segment(ray_from,ray_to,&rpos,&rnorm)) {
+
+				real_t dp = ray_dir.dot(rpos);
+				if (dp<min_d) {
+
+					r_pos=t.xform(rpos);
+					r_normal=ti.basis.xform_inv(rnorm).normalized();
+					min_d=dp;
+					idx=i+handles.size();
+
+				}
+			}
+#endif
+		}
+
+		if (p_sec_first && idx!=-1) {
+
+			*r_gizmo_handle=idx;
+			return true;
+		}
+
+		min_d=1e20;
+
+		for(int i=0;i<handles.size();i++) {
+
+#if 1
+
+
+			Vector3 hpos = t.xform(handles[i]);
+			Vector2 p = p_camera->unproject_position(hpos);
+			if (p.distance_to(p_point)<SpatialEditorGizmos::singleton->handle_t->get_width()*0.6) {
+
+
+				real_t dp = p_camera->get_transform().origin.distance_to(hpos);
+				if (dp<min_d) {
+
+					r_pos=t.xform(hpos);
+					r_normal=p_camera->get_transform().basis.get_axis(2);
+					min_d=dp;
+					idx=i;
+
+				}
+
+			}
+
+#else
+
+			AABB aabb;
+			aabb.pos=Vector3(-1,-1,-1)*HANDLE_HALF_SIZE;
+			aabb.size=aabb.pos*-2;
+			aabb.pos+=handles[i];
+
+
+			Vector3 rpos,rnorm;
+
+			if (aabb.intersects_segment(ray_from,ray_to,&rpos,&rnorm)) {
+
+				real_t dp = ray_dir.dot(rpos);
+				if (dp<min_d) {
+
+					r_pos=t.xform(rpos);
+					r_normal=ti.basis.xform_inv(rnorm).normalized();
+					min_d=dp;
+					idx=i;
+
+				}
+			}
+#endif
+		}
+
+		if (idx>=0) {
+			*r_gizmo_handle=idx;
+			return true;
+		}
+
+
+	}
+
+	if (collision_segments.size()) {
+
+		Plane camp(p_camera->get_transform().origin,(-p_camera->get_transform().basis.get_axis(2)).normalized());
+
+		int vc=collision_segments.size();
+		const Vector3* vptr=collision_segments.ptr();
+		Transform t = spatial_node->get_global_transform();
+		if (billboard_handle) {
+			t.set_look_at(t.origin,t.origin+p_camera->get_transform().basis.get_axis(2),p_camera->get_transform().basis.get_axis(1));
+		}
+
+		Vector3 cp;
+		float cpd=1e20;
+
+		for(int i=0;i<vc/2;i++) {
+
+
+			Vector3 a=t.xform(vptr[i*2+0]);
+			Vector3 b=t.xform(vptr[i*2+1]);
+			Vector2 s[2];
+			s[0] = p_camera->unproject_position(a);
+			s[1] = p_camera->unproject_position(b);
+
+
+			Vector2 p = Geometry::get_closest_point_to_segment_2d(p_point,s);
+
+			float pd = p.distance_to(p_point);
+
+			if (pd<cpd) {
+
+
+				float d = s[0].distance_to(s[1]);
+				Vector3 tcp;
+				if (d>0) {
+
+					float d2=s[0].distance_to(p)/d;
+					tcp = a+(b-a)*d2;
+
+				} else {
+					tcp=a;
+
+				}
+
+				if (camp.distance_to(tcp)<p_camera->get_znear())
+					continue;
+				cp=tcp;
+				cpd=pd;
+			}
+		}
+
+		if (cpd<8) {
+
+			r_pos=cp;
+			r_normal=-p_camera->project_ray_normal(p_point);
+			return true;
+		}
+
+		return false;
+	}
+
+
+	if (collision_mesh.is_valid()) {
+		Transform gt = spatial_node->get_global_transform();
+
+		if (billboard_handle) {
+			gt.set_look_at(gt.origin,gt.origin+p_camera->get_transform().basis.get_axis(2),p_camera->get_transform().basis.get_axis(1));
+		}
+
+		Transform ai=gt.affine_inverse();
+		Vector3 ray_from = ai.xform(p_camera->project_ray_origin(p_point));
+		Vector3 ray_dir=ai.basis.xform(p_camera->project_ray_normal(p_point)).normalized();
+		Vector3 rpos,rnorm;
+
+#if 1
+
+
+
+		if (collision_mesh->intersect_ray(ray_from,ray_dir,rpos,rnorm)) {
+
+			r_pos=gt.xform(rpos);
+			r_normal=gt.basis.xform(rnorm).normalized();
+			return true;
+		}
+#else
+
+		if (collision_mesh->intersect_segment(ray_from,ray_from+ray_dir*4906.0,rpos,rnorm)) {
+
+			r_pos=gt.xform(rpos);
+			r_normal=gt.basis.xform(rnorm).normalized();
+			return true;
+		}
+
+#endif
+	}
+
+	return false;
+
+}
+
+
+
+void SpatialGizmoTool::create() {
+
+	ERR_FAIL_COND(!spatial_node);
+	ERR_FAIL_COND(valid);
+	valid=true;
+
+	for(int i=0;i<instances.size();i++) {
+
+		instances[i].create_instance(spatial_node);
+	}
+
+	transform();
+
+}
+
+void SpatialGizmoTool::transform(){
+
+	ERR_FAIL_COND(!spatial_node);
+	ERR_FAIL_COND(!valid);
+	for(int i=0;i<instances.size();i++) {
+		VS::get_singleton()->instance_set_transform(instances[i].instance,spatial_node->get_global_transform());
+	}
+
+}
+
+
+void SpatialGizmoTool::free(){
+
+	ERR_FAIL_COND(!spatial_node);
+	ERR_FAIL_COND(!valid);
+
+	for(int i=0;i<instances.size();i++) {
+
+		if (instances[i].instance.is_valid())
+			VS::get_singleton()->free(instances[i].instance);
+		instances[i].instance=RID();
+	}
+
+	valid=false;
+
+
+}
+
+
+
+SpatialGizmoTool::SpatialGizmoTool() {
+	valid=false;
+	billboard_handle=false;
+
+}
+
+SpatialGizmoTool::~SpatialGizmoTool(){
+
+	clear();
+}
+
+Vector3 SpatialGizmoTool::get_handle_pos(int p_idx) const {
+
+	ERR_FAIL_INDEX_V(p_idx,handles.size(),Vector3());
+
+	return handles[p_idx];
+
+}
+
+//// light gizmo
+
+
+String LightSpatialGizmo::get_handle_name(int p_idx) const {
+
+	if (p_idx==0)
+		return "Radius";
+	else
+		return "Aperture";
+}
+
+
+Variant LightSpatialGizmo::get_handle_value(int p_idx) const{
+
+	if (p_idx==0)
+		return light->get_parameter(Light::PARAM_RADIUS);
+	if (p_idx==1)
+		return light->get_parameter(Light::PARAM_SPOT_ANGLE);
+
+	return Variant();
+}
+
+
+static float _find_closest_angle_to_half_pi_arc(const Vector3& p_from, const Vector3& p_to, float p_arc_radius,const Transform& p_arc_xform) {
+
+	//bleh, discrete is simpler
+	static const int arc_test_points=64;
+	float min_d = 1e20;
+	Vector3 min_p;
+
+
+	for(int i=0;i<arc_test_points;i++) {
+
+		float a = i*Math_PI*0.5/arc_test_points;
+		float an = (i+1)*Math_PI*0.5/arc_test_points;
+		Vector3 p=Vector3( Math::cos(a), 0, -Math::sin(a) )*p_arc_radius;
+		Vector3 n=Vector3( Math::cos(an), 0,- Math::sin(an) )*p_arc_radius;
+
+		Vector3 ra,rb;
+		Geometry::get_closest_points_between_segments(p,n,p_from,p_to,ra,rb);
+
+		float d = ra.distance_to(rb);
+		if (d<min_d) {
+			min_d=d;
+			min_p=ra;
+		}
+
+	}
+
+	//min_p = p_arc_xform.affine_inverse().xform(min_p);
+	float a = Vector2(min_p.x,-min_p.z).atan2();
+	return a*180.0/Math_PI;
+}
+
+
+void LightSpatialGizmo::set_handle(int p_idx,Camera *p_camera, const Point2& p_point) {
+
+	Transform gt = light->get_global_transform();
+	gt.orthonormalize();
+	Transform gi = gt.affine_inverse();
+
+	Vector3 ray_from = p_camera->project_ray_origin(p_point);
+	Vector3 ray_dir = p_camera->project_ray_normal(p_point);
+
+	Vector3 s[2]={gi.xform(ray_from),gi.xform(ray_from+ray_dir*4096)};
+	if (p_idx==0) {
+
+		if (light->cast_to<SpotLight>()) {
+			Vector3 ra,rb;
+			Geometry::get_closest_points_between_segments(Vector3(),Vector3(0,0,-4096),s[0],s[1],ra,rb);
+
+			float d = -ra.z;
+			if (d<0)
+				d=0;
+
+			light->set_parameter(Light::PARAM_RADIUS,d);
+		} else if (light->cast_to<OmniLight>()) {
+
+			Plane cp=Plane( gt.origin, p_camera->get_transform().basis.get_axis(2));
+
+			Vector3 inters;
+			if (cp.intersects_ray(ray_from,ray_dir,&inters)) {
+
+				float r = inters.distance_to(gt.origin);
+				light->set_parameter(Light::PARAM_RADIUS,r);
+			}
+
+		}
+
+	} else if (p_idx==1) {
+
+		float a = _find_closest_angle_to_half_pi_arc(s[0],s[1],light->get_parameter(Light::PARAM_RADIUS),gt);
+		light->set_parameter(Light::PARAM_SPOT_ANGLE,CLAMP(a,0.01,89.99));
+	}
+}
+
+void LightSpatialGizmo::commit_handle(int p_idx,const Variant& p_restore,bool p_cancel){
+
+	if (p_cancel) {
+
+		light->set_parameter(p_idx==0?Light::PARAM_RADIUS:Light::PARAM_SPOT_ANGLE,p_restore);
+
+	} else if (p_idx==0) {
+
+		UndoRedo *ur = SpatialEditor::get_singleton()->get_undo_redo();
+		ur->create_action("Change Light Radius");
+		ur->add_do_method(light,"set_parameter",Light::PARAM_RADIUS,light->get_parameter(Light::PARAM_RADIUS));
+		ur->add_undo_method(light,"set_parameter",Light::PARAM_RADIUS,p_restore);
+		ur->commit_action();
+	} else if (p_idx==1) {
+
+		UndoRedo *ur = SpatialEditor::get_singleton()->get_undo_redo();
+		ur->create_action("Change Light Radius");
+		ur->add_do_method(light,"set_parameter",Light::PARAM_SPOT_ANGLE,light->get_parameter(Light::PARAM_SPOT_ANGLE));
+		ur->add_undo_method(light,"set_parameter",Light::PARAM_SPOT_ANGLE,p_restore);
+		ur->commit_action();
+
+	}
+}
+
+
+
+void LightSpatialGizmo::redraw() {
+
+
+	if (light->cast_to<DirectionalLight>()) {
+
+
+
+		const int arrow_points=5;
+		Vector3 arrow[arrow_points]={
+			Vector3(0,0,2),
+			Vector3(1,1,2),
+			Vector3(1,1,-1),
+			Vector3(2,2,-1),
+			Vector3(0,0,-3)
+		};
+
+		int arrow_sides=4;
+
+		Vector<Vector3> lines;
+
+
+		for(int i = 0; i < arrow_sides ; i++) {
+
+
+			Matrix3 ma(Vector3(0,0,1),Math_PI*2*float(i)/arrow_sides);
+			Matrix3 mb(Vector3(0,0,1),Math_PI*2*float(i+1)/arrow_sides);
+
+
+			for(int j=1;j<arrow_points-1;j++) {
+
+				if (j!=2) {
+					lines.push_back(ma.xform(arrow[j]));
+					lines.push_back(ma.xform(arrow[j+1]));
+				}
+				if (j<arrow_points-1) {
+					lines.push_back(ma.xform(arrow[j]));
+					lines.push_back(mb.xform(arrow[j]));
+				}
+
+			}
+		}
+
+		add_lines(lines,SpatialEditorGizmos::singleton->light_material);
+		add_collision_segments(lines);
+		add_unscaled_billboard(SpatialEditorGizmos::singleton->light_material_directional_icon,0.05);
+
+	}
+
+	if (light->cast_to<OmniLight>()) {
+
+		clear();
+
+
+		OmniLight *on = light->cast_to<OmniLight>();
+
+		float r = on->get_parameter(Light::PARAM_RADIUS);
+
+		Vector<Vector3> points;
+
+		for(int i=0;i<=360;i++) {
+
+			float ra=Math::deg2rad(i);
+			float rb=Math::deg2rad(i+1);
+			Point2 a = Vector2(Math::sin(ra),Math::cos(ra))*r;
+			Point2 b = Vector2(Math::sin(rb),Math::cos(rb))*r;
+
+			/*points.push_back(Vector3(a.x,0,a.y));
+			points.push_back(Vector3(b.x,0,b.y));
+			points.push_back(Vector3(0,a.x,a.y));
+			points.push_back(Vector3(0,b.x,b.y));*/
+			points.push_back(Vector3(a.x,a.y,0));
+			points.push_back(Vector3(b.x,b.y,0));
+
+		}
+
+		add_lines(points,SpatialEditorGizmos::singleton->light_material,true);
+		add_collision_segments(points);
+
+		add_unscaled_billboard(SpatialEditorGizmos::singleton->light_material_omni_icon,0.05);
+
+		Vector<Vector3> handles;
+		handles.push_back(Vector3(r,0,0));
+		add_handles(handles,true);
+
+
+	}
+
+
+	if (light->cast_to<SpotLight>()) {
+
+		clear();
+
+		Vector<Vector3> points;
+		SpotLight *on = light->cast_to<SpotLight>();
+
+		float r = on->get_parameter(Light::PARAM_RADIUS);
+		float w = r*Math::sin(Math::deg2rad(on->get_parameter(Light::PARAM_SPOT_ANGLE)));
+		float d = r*Math::cos(Math::deg2rad(on->get_parameter(Light::PARAM_SPOT_ANGLE)));
+
+
+
+		for(int i=0;i<360;i++) {
+
+			float ra=Math::deg2rad(i);
+			float rb=Math::deg2rad(i+1);
+			Point2 a = Vector2(Math::sin(ra),Math::cos(ra))*w;
+			Point2 b = Vector2(Math::sin(rb),Math::cos(rb))*w;
+
+			/*points.push_back(Vector3(a.x,0,a.y));
+			points.push_back(Vector3(b.x,0,b.y));
+			points.push_back(Vector3(0,a.x,a.y));
+			points.push_back(Vector3(0,b.x,b.y));*/
+			points.push_back(Vector3(a.x,a.y,-d));
+			points.push_back(Vector3(b.x,b.y,-d));
+
+			if (i%90==0) {
+
+				points.push_back(Vector3(a.x,a.y,-d));
+				points.push_back(Vector3());
+
+			}
+
+
+		}
+
+		points.push_back(Vector3(0,0,-r));
+		points.push_back(Vector3());
+
+		add_lines(points,SpatialEditorGizmos::singleton->light_material);
+
+		Vector<Vector3> handles;
+		handles.push_back(Vector3(0,0,-r));
+
+		Vector<Vector3> collision_segments;
+
+		for(int i=0;i<64;i++) {
+
+			float ra=i*Math_PI*2.0/64.0;
+			float rb=(i+1)*Math_PI*2.0/64.0;
+			Point2 a = Vector2(Math::sin(ra),Math::cos(ra))*w;
+			Point2 b = Vector2(Math::sin(rb),Math::cos(rb))*w;
+
+			collision_segments.push_back(Vector3(a.x,a.y,-d));
+			collision_segments.push_back(Vector3(b.x,b.y,-d));
+
+			if (i%16==0) {
+
+				collision_segments.push_back(Vector3(a.x,a.y,-d));
+				collision_segments.push_back(Vector3());
+
+			}
+
+			if (i==16) {
+
+				handles.push_back(Vector3(a.x,a.y,-d));
+			}
+
+		}
+
+		collision_segments.push_back(Vector3(0,0,-r));
+		collision_segments.push_back(Vector3());
+
+
+		add_handles(handles);
+		add_collision_segments(collision_segments);
+		add_unscaled_billboard(SpatialEditorGizmos::singleton->light_material_omni_icon,0.05);
+
+	}
+
+}
+
+LightSpatialGizmo::LightSpatialGizmo(Light* p_light){
+
+	light=p_light;
+	set_spatial_node(p_light);
+
+}
+
+//////
+
+String CameraSpatialGizmo::get_handle_name(int p_idx) const {
+
+	if (camera->get_projection()==Camera::PROJECTION_PERSPECTIVE) {
+		return "FOV";
+	} else {
+		return "Size";
+	}
+}
+Variant CameraSpatialGizmo::get_handle_value(int p_idx) const{
+
+	if (camera->get_projection()==Camera::PROJECTION_PERSPECTIVE) {
+		return camera->get_fov();
+	} else {
+
+		return camera->get_size();
+	}
+}
+void CameraSpatialGizmo::set_handle(int p_idx,Camera *p_camera, const Point2& p_point){
+
+	Transform gt = camera->get_global_transform();
+	gt.orthonormalize();
+	Transform gi = gt.affine_inverse();
+
+	Vector3 ray_from = p_camera->project_ray_origin(p_point);
+	Vector3 ray_dir = p_camera->project_ray_normal(p_point);
+
+	Vector3 s[2]={gi.xform(ray_from),gi.xform(ray_from+ray_dir*4096)};
+
+	if (camera->get_projection()==Camera::PROJECTION_PERSPECTIVE) {
+		Transform gt=camera->get_global_transform();
+		float a = _find_closest_angle_to_half_pi_arc(s[0],s[1],1.0,gt);
+		camera->set("fov",a);
+	} else {
+
+		Vector3 ra,rb;
+		Geometry::get_closest_points_between_segments(Vector3(0,0,-1),Vector3(4096,0,-1),s[0],s[1],ra,rb);
+		float d = ra.x * 2.0;
+		if (d<0)
+			d=0;
+
+		camera->set("size",d);
+	}
+
+}
+void CameraSpatialGizmo::commit_handle(int p_idx,const Variant& p_restore,bool p_cancel){
+
+	if (camera->get_projection()==Camera::PROJECTION_PERSPECTIVE) {
+
+		if (p_cancel) {
+
+			camera->set("fov",p_restore);
+		} else {
+			UndoRedo *ur = SpatialEditor::get_singleton()->get_undo_redo();
+			ur->create_action("Change Camera FOV");
+			ur->add_do_property(camera,"fov",camera->get_fov());
+			ur->add_undo_property(camera,"fov",p_restore);
+			ur->commit_action();
+		}
+
+	} else {
+
+		if (p_cancel) {
+
+			camera->set("size",p_restore);
+		} else {
+			UndoRedo *ur = SpatialEditor::get_singleton()->get_undo_redo();
+			ur->create_action("Change Camera Size");
+			ur->add_do_property(camera,"size",camera->get_size());
+			ur->add_undo_property(camera,"size",p_restore);
+			ur->commit_action();
+		}
+
+	}
+
+}
+
+void CameraSpatialGizmo::redraw(){
+
+	clear();
+
+	Vector<Vector3> lines;
+	Vector<Vector3> handles;
+
+
+	switch(camera->get_projection()) {
+
+		case Camera::PROJECTION_PERSPECTIVE: {
+
+			float fov = camera->get_fov();
+
+			Vector3 side=Vector3( Math::sin(Math::deg2rad(fov)), 0, -Math::cos(Math::deg2rad(fov)) );
+			Vector3 nside=side;
+			nside.x=-nside.x;
+			Vector3 up=Vector3(0,side.x,0);
+
+
+#define ADD_TRIANGLE( m_a, m_b, m_c)\
+{\
+	lines.push_back(m_a);\
+	lines.push_back(m_b);\
+	lines.push_back(m_b);\
+	lines.push_back(m_c);\
+	lines.push_back(m_c);\
+	lines.push_back(m_a);\
+}
+
+			ADD_TRIANGLE( Vector3(), side+up, side-up );
+			ADD_TRIANGLE( Vector3(), nside+up, nside-up );
+			ADD_TRIANGLE( Vector3(), side+up, nside+up );
+			ADD_TRIANGLE( Vector3(), side-up, nside-up );
+
+			handles.push_back(side);
+			side.x*=0.25;
+			nside.x*=0.25;
+			Vector3 tup( 0, up.y*3/2,side.z);
+			ADD_TRIANGLE( tup, side+up, nside+up );
+
+		} break;
+		case Camera::PROJECTION_ORTHOGONAL: {
+
+#define ADD_QUAD( m_a, m_b, m_c, m_d)\
+{\
+	lines.push_back(m_a);\
+	lines.push_back(m_b);\
+	lines.push_back(m_b);\
+	lines.push_back(m_c);\
+	lines.push_back(m_c);\
+	lines.push_back(m_d);\
+	lines.push_back(m_d);\
+	lines.push_back(m_a);\
+}
+			float size = camera->get_size();
+
+			float hsize=size*0.5;
+			Vector3 right(hsize,0,0);
+			Vector3 up(0,hsize,0);
+			Vector3 back(0,0,-1.0);
+			Vector3 front(0,0,0);
+
+			ADD_QUAD( -up-right,-up+right,up+right,up-right);
+			ADD_QUAD( -up-right+back,-up+right+back,up+right+back,up-right+back);
+			ADD_QUAD( up+right,up+right+back,up-right+back,up-right);
+			ADD_QUAD( -up+right,-up+right+back,-up-right+back,-up-right);
+			handles.push_back(right+back);
+
+			right.x*=0.25;
+			Vector3 tup( 0, up.y*3/2,back.z );
+			ADD_TRIANGLE( tup, right+up+back, -right+up+back );
+
+		} break;
+
+	}
+
+	add_lines(lines,SpatialEditorGizmos::singleton->camera_material);
+	add_collision_segments(lines);
+	add_handles(handles);
+}
+
+
+CameraSpatialGizmo::CameraSpatialGizmo(Camera* p_camera){
+
+	camera=p_camera;
+	set_spatial_node(camera);
+}
+
+
+
+
+//////
+
+void MeshInstanceSpatialGizmo::redraw() {
+
+	Ref<Mesh> m = mesh->get_mesh();
+	if (!m.is_valid())
+		return; //none
+
+	Ref<TriangleMesh> tm = m->generate_triangle_mesh();
+	if (tm.is_valid())
+		add_collision_triangles(tm);
+}
+
+MeshInstanceSpatialGizmo::MeshInstanceSpatialGizmo(MeshInstance* p_mesh) {
+
+	mesh=p_mesh;
+	set_spatial_node(p_mesh);
+}
+
+/////
+
+
+void Position3DSpatialGizmo::redraw() {
+
+	clear();
+	add_mesh(SpatialEditorGizmos::singleton->pos3d_mesh);
+	Vector<Vector3> cursor_points;
+	float cs = 0.25;
+	cursor_points.push_back(Vector3(+cs,0,0));
+	cursor_points.push_back(Vector3(-cs,0,0));
+	cursor_points.push_back(Vector3(0,+cs,0));
+	cursor_points.push_back(Vector3(0,-cs,0));
+	cursor_points.push_back(Vector3(0,0,+cs));
+	cursor_points.push_back(Vector3(0,0,-cs));
+	add_collision_segments(cursor_points);
+
+}
+
+
+Position3DSpatialGizmo::Position3DSpatialGizmo(Position3D* p_p3d) {
+
+	p3d=p_p3d;
+	set_spatial_node(p3d);
+}
+
+
+/////
+
+void SkeletonSpatialGizmo::redraw() {
+
+	clear();
+
+	Ref<SurfaceTool> surface_tool( memnew( SurfaceTool ));
+
+
+	surface_tool->begin(Mesh::PRIMITIVE_LINES);
+	surface_tool->set_material(SpatialEditorGizmos::singleton->skeleton_material);
+	Vector<Transform> grests;
+	grests.resize(skel->get_bone_count());
+
+	Vector<int> bones;
+	Vector<float> weights;
+	bones.resize(4);
+	weights.resize(4);
+
+	for(int i=0;i<4;i++) {
+		bones[i]=0;
+		weights[i]=0;
+	}
+
+	weights[0]=1;
+
+
+	AABB aabb;
+
+	Color bonecolor = Color(1.0,0.4,0.4,0.3);
+	Color rootcolor = Color(0.4,1.0,0.4,0.1);
+
+	for (int i=0;i<skel->get_bone_count();i++) {
+
+		int parent = skel->get_bone_parent(i);
+
+		if (parent>=0) {
+			grests[i]=grests[parent] * skel->get_bone_rest(i);
+
+			Vector3 v0 = grests[parent].origin;
+			Vector3 v1 = grests[i].origin;
+			Vector3 d = (v1-v0).normalized();
+			float dist = v0.distance_to(v1);
+
+			//find closest axis
+			int closest=-1;
+			float closest_d = 0.0;
+
+			for(int j=0;j<3;j++) {
+				float dp = Math::abs(grests[parent].basis[j].normalized().dot(d));
+				if (j==0 || dp>closest_d)
+					closest=j;
+			}
+
+			//find closest other
+			Vector3 first;
+			Vector3 points[4];
+			int pointidx=0;
+			for(int j=0;j<3;j++) {
+
+				bones[0]=parent;
+				surface_tool->add_bones(bones);
+				surface_tool->add_weights(weights);
+				surface_tool->add_color(rootcolor);
+				surface_tool->add_vertex(v0-grests[parent].basis[j].normalized()*dist*0.05);
+				surface_tool->add_bones(bones);
+				surface_tool->add_weights(weights);
+				surface_tool->add_color(rootcolor);
+				surface_tool->add_vertex(v0+grests[parent].basis[j].normalized()*dist*0.05);
+
+				if (j==closest)
+					continue;
+
+				Vector3 axis;
+				if (first==Vector3()) {
+					axis = d.cross(d.cross(grests[parent].basis[j])).normalized();
+					first=axis;
+				} else {
+					axis = d.cross(first).normalized();
+				}
+
+				for(int k=0;k<2;k++) {
+
+					if (k==1)
+						axis=-axis;
+					Vector3 point = v0+d*dist*0.2;
+					point+=axis*dist*0.1;
+
+
+					bones[0]=parent;
+					surface_tool->add_bones(bones);
+					surface_tool->add_weights(weights);
+					surface_tool->add_color(bonecolor);
+					surface_tool->add_vertex(v0);
+					surface_tool->add_bones(bones);
+					surface_tool->add_weights(weights);
+					surface_tool->add_color(bonecolor);
+					surface_tool->add_vertex(point);
+
+					bones[0]=parent;
+					surface_tool->add_bones(bones);
+					surface_tool->add_weights(weights);
+					surface_tool->add_color(bonecolor);
+					surface_tool->add_vertex(point);
+					bones[0]=i;
+					surface_tool->add_bones(bones);
+					surface_tool->add_weights(weights);
+					surface_tool->add_color(bonecolor);
+					surface_tool->add_vertex(v1);
+					points[pointidx++]=point;
+
+				}
+
+			}
+
+			SWAP( points[1],points[2] );
+			for(int j=0;j<4;j++) {
+
+
+				bones[0]=parent;
+				surface_tool->add_bones(bones);
+				surface_tool->add_weights(weights);
+				surface_tool->add_color(bonecolor);
+				surface_tool->add_vertex(points[j]);
+				surface_tool->add_bones(bones);
+				surface_tool->add_weights(weights);
+				surface_tool->add_color(bonecolor);
+				surface_tool->add_vertex(points[(j+1)%4]);
+			}
+
+
+/*
+			bones[0]=parent;
+			surface_tool->add_bones(bones);
+			surface_tool->add_weights(weights);
+			surface_tool->add_color(Color(0.4,1,0.4,0.4));
+			surface_tool->add_vertex(v0);
+			bones[0]=i;
+			surface_tool->add_bones(bones);
+			surface_tool->add_weights(weights);
+			surface_tool->add_color(Color(0.4,1,0.4,0.4));
+			surface_tool->add_vertex(v1);
+*/
+		} else {
+
+			grests[i]=skel->get_bone_rest(i);
+			bones[0]=i;
+		}
+/*
+		Transform  t = grests[i];
+		t.orthonormalize();
+
+		for (int i=0;i<6;i++) {
+
+
+			Vector3 face_points[4];
+
+			for (int j=0;j<4;j++) {
+
+				float v[3];
+				v[0]=1.0;
+				v[1]=1-2*((j>>1)&1);
+				v[2]=v[1]*(1-2*(j&1));
+
+				for (int k=0;k<3;k++) {
+
+					if (i<3)
+						face_points[j][(i+k)%3]=v[k]*(i>=3?-1:1);
+					else
+						face_points[3-j][(i+k)%3]=v[k]*(i>=3?-1:1);
+				}
+			}
+
+			for(int j=0;j<4;j++) {
+				surface_tool->add_bones(bones);
+				surface_tool->add_weights(weights);
+				surface_tool->add_color(Color(1.0,0.4,0.4,0.4));
+				surface_tool->add_vertex(t.xform(face_points[j]*0.04));
+				surface_tool->add_bones(bones);
+				surface_tool->add_weights(weights);
+				surface_tool->add_color(Color(1.0,0.4,0.4,0.4));
+				surface_tool->add_vertex(t.xform(face_points[(j+1)%4]*0.04));
+			}
+
+		}
+		*/
+	}
+
+	Ref<Mesh> m = surface_tool->commit();
+	add_mesh(m,false,skel->get_skeleton());
+
+}
+
+SkeletonSpatialGizmo::SkeletonSpatialGizmo(Skeleton* p_skel) {
+
+	skel=p_skel;
+	set_spatial_node(p_skel);
+}
+
+/////
+
+
+void SpatialPlayerSpatialGizmo::redraw() {
+
+	clear();
+	if (splayer->cast_to<SpatialStreamPlayer>()) {
+
+		add_unscaled_billboard(SpatialEditorGizmos::singleton->stream_player_icon,0.05);
+
+	} else if (splayer->cast_to<SpatialSamplePlayer>()) {
+
+		add_unscaled_billboard(SpatialEditorGizmos::singleton->sample_player_icon,0.05);
+
+	}
+
+}
+
+SpatialPlayerSpatialGizmo::SpatialPlayerSpatialGizmo(SpatialPlayer* p_splayer){
+
+	set_spatial_node(p_splayer);
+	splayer=p_splayer;
+}
+
+
+/////
+
+
+void RoomSpatialGizmo::redraw() {
+
+	clear();
+	Ref<RoomBounds> roomie = room->get_room();
+	if (roomie.is_null())
+		return;
+	DVector<Face3> faces = roomie->get_geometry_hint();
+
+	Vector<Vector3> lines;
+	int fc=faces.size();
+	DVector<Face3>::Read r =faces.read();
+
+	Map<_EdgeKey,Vector3> edge_map;
+
+	for(int i=0;i<fc;i++) {
+
+		Vector3 fn = r[i].get_plane().normal;
+
+		for(int j=0;j<3;j++) {
+
+			_EdgeKey ek;
+			ek.from=r[i].vertex[j].snapped(CMP_EPSILON);
+			ek.to=r[i].vertex[(j+1)%3].snapped(CMP_EPSILON);
+			if (ek.from<ek.to)
+				SWAP(ek.from,ek.to);
+
+			Map<_EdgeKey,Vector3>::Element *E=edge_map.find(ek);
+
+			if (E) {
+
+				if (E->get().dot(fn) >0.9) {
+
+					E->get()=Vector3();
+				}
+
+			} else {
+
+				edge_map[ek]=fn;
+			}
+
+		}
+	}
+
+	for(Map<_EdgeKey,Vector3>::Element *E=edge_map.front();E;E=E->next()) {
+
+		if (E->get()!=Vector3()) {
+			lines.push_back(E->key().from);
+			lines.push_back(E->key().to);
+		}
+	}
+
+	add_lines(lines,SpatialEditorGizmos::singleton->room_material);
+	add_collision_segments(lines);
+
+}
+
+RoomSpatialGizmo::RoomSpatialGizmo(Room* p_room){
+
+	set_spatial_node(p_room);
+	room=p_room;
+}
+
+/////
+
+
+void PortalSpatialGizmo::redraw() {
+
+	clear();
+
+	Vector<Point2> points = portal->get_shape();
+	if (points.size()==0) {
+		return;
+	}
+
+	Vector<Vector3> lines;
+
+	Vector3 center;
+	for(int i=0;i<points.size();i++) {
+
+		Vector3 f;
+		f.x=points[i].x;
+		f.y=points[i].y;
+		Vector3 fn;
+		fn.x=points[(i+1)%points.size()].x;
+		fn.y=points[(i+1)%points.size()].y;
+		center+=f;
+
+		lines.push_back(f);
+		lines.push_back(fn);
+	}
+
+	center/=points.size();
+	lines.push_back(center);
+	lines.push_back(center+Vector3(0,0,1));
+
+	add_lines(lines,SpatialEditorGizmos::singleton->portal_material);
+	add_collision_segments(lines);
+
+}
+
+PortalSpatialGizmo::PortalSpatialGizmo(Portal* p_portal){
+
+	set_spatial_node(p_portal);
+	portal=p_portal;
+}
+
+/////
+
+
+void RayCastSpatialGizmo::redraw() {
+
+	clear();
+
+
+	Vector<Vector3> lines;
+
+	lines.push_back(Vector3());
+	lines.push_back(raycast->get_cast_to());
+
+	add_lines(lines,SpatialEditorGizmos::singleton->raycast_material);
+	add_collision_segments(lines);
+
+}
+
+RayCastSpatialGizmo::RayCastSpatialGizmo(RayCast* p_raycast){
+
+	set_spatial_node(p_raycast);
+	raycast=p_raycast;
+}
+
+
+
+/////
+
+
+void VehicleWheelSpatialGizmo::redraw() {
+
+	clear();
+
+
+	Vector<Vector3> points;
+
+	float r = car_wheel->get_radius();
+	const int skip=10;
+	for(int i=0;i<=360;i+=skip) {
+
+		float ra=Math::deg2rad(i);
+		float rb=Math::deg2rad(i+skip);
+		Point2 a = Vector2(Math::sin(ra),Math::cos(ra))*r;
+		Point2 b = Vector2(Math::sin(rb),Math::cos(rb))*r;
+
+		points.push_back(Vector3(0,a.x,a.y));
+		points.push_back(Vector3(0,b.x,b.y));
+
+		const int springsec=4;
+
+		for(int j=0;j<springsec;j++) {
+			float t = car_wheel->get_suspension_rest_length()*5;
+			points.push_back(Vector3(a.x,i/360.0*t/springsec+j*(t/springsec),a.y)*0.2);
+			points.push_back(Vector3(b.x,(i+skip)/360.0*t/springsec+j*(t/springsec),b.y)*0.2);
+		}
+
+
+	}
+
+	//travel
+	points.push_back(Vector3(0,0,0));
+	points.push_back(Vector3(0,car_wheel->get_suspension_rest_length(),0));
+
+	//axis
+	points.push_back(Vector3(r*0.2,car_wheel->get_suspension_rest_length(),0));
+	points.push_back(Vector3(-r*0.2,car_wheel->get_suspension_rest_length(),0));
+	//axis
+	points.push_back(Vector3(r*0.2,0,0));
+	points.push_back(Vector3(-r*0.2,0,0));
+
+	//forward line
+	points.push_back(Vector3(0,-r,0));
+	points.push_back(Vector3(0,-r,r*2));
+	points.push_back(Vector3(0,-r,r*2));
+	points.push_back(Vector3(r*2*0.2,-r,r*2*0.8));
+	points.push_back(Vector3(0,-r,r*2));
+	points.push_back(Vector3(-r*2*0.2,-r,r*2*0.8));
+
+	add_lines(points,SpatialEditorGizmos::singleton->car_wheel_material);
+	add_collision_segments(points);
+
+}
+
+VehicleWheelSpatialGizmo::VehicleWheelSpatialGizmo(VehicleWheel* p_car_wheel){
+
+	set_spatial_node(p_car_wheel);
+	car_wheel=p_car_wheel;
+}
+
+
+
+///
+
+void TestCubeSpatialGizmo::redraw() {
+
+	clear();
+	add_collision_triangles(SpatialEditorGizmos::singleton->test_cube_tm);
+}
+
+TestCubeSpatialGizmo::TestCubeSpatialGizmo(TestCube* p_tc) {
+
+	tc=p_tc;
+	set_spatial_node(p_tc);
+}
+
+
+///////////
+
+
+
+
+
+
+String CollisionShapeSpatialGizmo::get_handle_name(int p_idx) const {
+
+	Ref<Shape> s = cs->get_shape();
+	if (s.is_null())
+		return "";
+
+	if (s->cast_to<SphereShape>()) {
+
+		return "Radius";
+	}
+
+	if (s->cast_to<BoxShape>()) {
+
+		return "Extents";
+	}
+
+	if (s->cast_to<CapsuleShape>()) {
+
+		return p_idx==0?"Radius":"Height";
+	}
+
+	if (s->cast_to<RayShape>()) {
+
+		return "Length";
+	}
+
+	return "";
+}
+Variant CollisionShapeSpatialGizmo::get_handle_value(int p_idx) const{
+
+	Ref<Shape> s = cs->get_shape();
+	if (s.is_null())
+		return Variant();
+
+	if (s->cast_to<SphereShape>()) {
+
+		Ref<SphereShape> ss = s;
+		return ss->get_radius();
+	}
+
+	if (s->cast_to<BoxShape>()) {
+
+		Ref<BoxShape> bs = s;
+		return bs->get_extents();
+	}
+
+	if (s->cast_to<CapsuleShape>()) {
+
+		Ref<CapsuleShape> cs = s;
+		return p_idx==0?cs->get_radius():cs->get_height();
+	}
+
+	if (s->cast_to<RayShape>()) {
+
+		Ref<RayShape> cs = s;
+		return cs->get_length();
+	}
+
+	return Variant();
+}
+void CollisionShapeSpatialGizmo::set_handle(int p_idx,Camera *p_camera, const Point2& p_point){
+	Ref<Shape> s = cs->get_shape();
+	if (s.is_null())
+		return;
+
+	Transform gt = cs->get_global_transform();
+	gt.orthonormalize();
+	Transform gi = gt.affine_inverse();
+
+	Vector3 ray_from = p_camera->project_ray_origin(p_point);
+	Vector3 ray_dir = p_camera->project_ray_normal(p_point);
+
+	Vector3 sg[2]={gi.xform(ray_from),gi.xform(ray_from+ray_dir*4096)};
+
+	if (s->cast_to<SphereShape>()) {
+
+		Ref<SphereShape> ss = s;
+		Vector3 ra,rb;
+		Geometry::get_closest_points_between_segments(Vector3(),Vector3(4096,0,0),sg[0],sg[1],ra,rb);
+		float d = ra.x;
+		if (d<0.001)
+			d=0.001;
+
+		ss->set_radius(d);
+	}
+
+	if (s->cast_to<RayShape>()) {
+
+		Ref<RayShape> rs = s;
+		Vector3 ra,rb;
+		Geometry::get_closest_points_between_segments(Vector3(),Vector3(0,0,4096),sg[0],sg[1],ra,rb);
+		float d = ra.z;
+		if (d<0.001)
+			d=0.001;
+
+		rs->set_length(d);
+	}
+
+
+	if (s->cast_to<BoxShape>()) {
+
+		Vector3 axis;
+		axis[p_idx]=1.0;
+		Ref<BoxShape> bs = s;
+		Vector3 ra,rb;
+		Geometry::get_closest_points_between_segments(Vector3(),axis*4096,sg[0],sg[1],ra,rb);
+		float d = ra[p_idx];
+		if (d<0.001)
+			d=0.001;
+
+		Vector3 he = bs->get_extents();
+		he[p_idx]=d;
+		bs->set_extents(he);
+
+	}
+
+	if (s->cast_to<CapsuleShape>()) {
+
+		Vector3 axis;
+		axis[p_idx==0?0:2]=1.0;
+		Ref<CapsuleShape> cs = s;
+		Vector3 ra,rb;
+		Geometry::get_closest_points_between_segments(Vector3(),axis*4096,sg[0],sg[1],ra,rb);
+		float d = axis.dot(ra);
+		if (p_idx==1)
+			d-=cs->get_radius();
+		if (d<0.001)
+			d=0.001;
+
+		if (p_idx==0)
+			cs->set_radius(d);
+		else if (p_idx==1)
+			cs->set_height(d*2.0);
+
+	}
+
+}
+void CollisionShapeSpatialGizmo::commit_handle(int p_idx,const Variant& p_restore,bool p_cancel){
+	Ref<Shape> s = cs->get_shape();
+	if (s.is_null())
+		return;
+
+	if (s->cast_to<SphereShape>()) {
+
+		Ref<SphereShape> ss=s;
+		if (p_cancel) {
+			ss->set_radius(p_restore);
+			return;
+		}
+
+		UndoRedo *ur = SpatialEditor::get_singleton()->get_undo_redo();
+		ur->create_action("Change Sphere Shape Radius");
+		ur->add_do_method(ss.ptr(),"set_radius",ss->get_radius());
+		ur->add_undo_method(ss.ptr(),"set_radius",p_restore);
+		ur->commit_action();
+
+	}
+
+	if (s->cast_to<BoxShape>()) {
+
+		Ref<BoxShape> ss=s;
+		if (p_cancel) {
+			ss->set_extents(p_restore);
+			return;
+		}
+
+		UndoRedo *ur = SpatialEditor::get_singleton()->get_undo_redo();
+		ur->create_action("Change Box Shape Extents");
+		ur->add_do_method(ss.ptr(),"set_extents",ss->get_extents());
+		ur->add_undo_method(ss.ptr(),"set_extents",p_restore);
+		ur->commit_action();
+	}
+
+	if (s->cast_to<CapsuleShape>()) {
+
+		Ref<CapsuleShape> ss=s;
+		if (p_cancel) {
+			if (p_idx==0)
+				ss->set_radius(p_restore);
+			else
+				ss->set_height(p_restore);
+			return;
+		}
+
+		UndoRedo *ur = SpatialEditor::get_singleton()->get_undo_redo();
+		if (p_idx==0) {
+			ur->create_action("Change Capsule Shape Radius");
+			ur->add_do_method(ss.ptr(),"set_radius",ss->get_radius());
+			ur->add_undo_method(ss.ptr(),"set_radius",p_restore);
+		} else {
+			ur->create_action("Change Capsule Shape Height");
+			ur->add_do_method(ss.ptr(),"set_height",ss->get_height());
+			ur->add_undo_method(ss.ptr(),"set_height",p_restore);
+
+		}
+
+		ur->commit_action();
+
+	}
+
+	if (s->cast_to<RayShape>()) {
+
+		Ref<RayShape> ss=s;
+		if (p_cancel) {
+			ss->set_length(p_restore);
+			return;
+		}
+
+		UndoRedo *ur = SpatialEditor::get_singleton()->get_undo_redo();
+		ur->create_action("Change Ray Shape Length");
+		ur->add_do_method(ss.ptr(),"set_length",ss->get_length());
+		ur->add_undo_method(ss.ptr(),"set_length",p_restore);
+		ur->commit_action();
+
+	}
+
+}
+void CollisionShapeSpatialGizmo::redraw(){
+
+	clear();
+
+	Ref<Shape> s = cs->get_shape();
+	if (s.is_null())
+		return;
+
+	if (s->cast_to<SphereShape>()) {
+
+		Ref<SphereShape> sp= s;
+		float r=sp->get_radius();
+
+		Vector<Vector3> points;
+
+		for(int i=0;i<=360;i++) {
+
+			float ra=Math::deg2rad(i);
+			float rb=Math::deg2rad(i+1);
+			Point2 a = Vector2(Math::sin(ra),Math::cos(ra))*r;
+			Point2 b = Vector2(Math::sin(rb),Math::cos(rb))*r;
+
+			points.push_back(Vector3(a.x,0,a.y));
+			points.push_back(Vector3(b.x,0,b.y));
+			points.push_back(Vector3(0,a.x,a.y));
+			points.push_back(Vector3(0,b.x,b.y));
+			points.push_back(Vector3(a.x,a.y,0));
+			points.push_back(Vector3(b.x,b.y,0));
+
+		}
+
+		Vector<Vector3> collision_segments;
+
+		for(int i=0;i<64;i++) {
+
+			float ra=i*Math_PI*2.0/64.0;
+			float rb=(i+1)*Math_PI*2.0/64.0;
+			Point2 a = Vector2(Math::sin(ra),Math::cos(ra))*r;
+			Point2 b = Vector2(Math::sin(rb),Math::cos(rb))*r;
+
+			collision_segments.push_back(Vector3(a.x,0,a.y));
+			collision_segments.push_back(Vector3(b.x,0,b.y));
+			collision_segments.push_back(Vector3(0,a.x,a.y));
+			collision_segments.push_back(Vector3(0,b.x,b.y));
+			collision_segments.push_back(Vector3(a.x,a.y,0));
+			collision_segments.push_back(Vector3(b.x,b.y,0));
+		}
+
+		add_lines(points,SpatialEditorGizmos::singleton->shape_material);
+		add_collision_segments(collision_segments);
+		Vector<Vector3> handles;
+		handles.push_back(Vector3(r,0,0));
+		add_handles(handles);
+
+	}
+
+	if (s->cast_to<BoxShape>()) {
+
+		Ref<BoxShape> bs=s;
+		Vector<Vector3> lines;
+		AABB aabb;
+		aabb.pos=-bs->get_extents();
+		aabb.size=aabb.pos*-2;
+
+		for(int i=0;i<12;i++) {
+			Vector3 a,b;
+			aabb.get_edge(i,a,b);
+			lines.push_back(a);
+			lines.push_back(b);
+		}
+
+		Vector<Vector3> handles;
+
+		for(int i=0;i<3;i++) {
+
+			Vector3 ax;
+			ax[i]=bs->get_extents()[i];
+			handles.push_back(ax);
+		}
+
+		add_lines(lines,SpatialEditorGizmos::singleton->shape_material);
+		add_collision_segments(lines);
+		add_handles(handles);
+
+	}
+
+	if (s->cast_to<CapsuleShape>()) {
+
+		Ref<CapsuleShape> cs=s;
+		float radius = cs->get_radius();
+		float height = cs->get_height();
+
+
+		Vector<Vector3> points;
+
+		Vector3 d(0,0,height*0.5);
+		for(int i=0;i<360;i++) {
+
+			float ra=Math::deg2rad(i);
+			float rb=Math::deg2rad(i+1);
+			Point2 a = Vector2(Math::sin(ra),Math::cos(ra))*radius;
+			Point2 b = Vector2(Math::sin(rb),Math::cos(rb))*radius;
+
+			points.push_back(Vector3(a.x,a.y,0)+d);
+			points.push_back(Vector3(b.x,b.y,0)+d);
+
+			points.push_back(Vector3(a.x,a.y,0)-d);
+			points.push_back(Vector3(b.x,b.y,0)-d);
+
+			if (i%90==0) {
+
+				points.push_back(Vector3(a.x,a.y,0)+d);
+				points.push_back(Vector3(a.x,a.y,0)-d);
+			}
+
+			Vector3 dud = i<180?d:-d;
+
+			points.push_back(Vector3(0,a.y,a.x)+dud);
+			points.push_back(Vector3(0,b.y,b.x)+dud);
+			points.push_back(Vector3(a.y,0,a.x)+dud);
+			points.push_back(Vector3(b.y,0,b.x)+dud);
+
+		}
+
+		add_lines(points,SpatialEditorGizmos::singleton->shape_material);
+
+		Vector<Vector3> collision_segments;
+
+		for(int i=0;i<64;i++) {
+
+			float ra=i*Math_PI*2.0/64.0;
+			float rb=(i+1)*Math_PI*2.0/64.0;
+			Point2 a = Vector2(Math::sin(ra),Math::cos(ra))*radius;
+			Point2 b = Vector2(Math::sin(rb),Math::cos(rb))*radius;
+
+			collision_segments.push_back(Vector3(a.x,a.y,0)+d);
+			collision_segments.push_back(Vector3(b.x,b.y,0)+d);
+
+			collision_segments.push_back(Vector3(a.x,a.y,0)-d);
+			collision_segments.push_back(Vector3(b.x,b.y,0)-d);
+
+			if (i%16==0) {
+
+				collision_segments.push_back(Vector3(a.x,a.y,0)+d);
+				collision_segments.push_back(Vector3(a.x,a.y,0)-d);
+			}
+
+			Vector3 dud = i<32?d:-d;
+
+			collision_segments.push_back(Vector3(0,a.y,a.x)+dud);
+			collision_segments.push_back(Vector3(0,b.y,b.x)+dud);
+			collision_segments.push_back(Vector3(a.y,0,a.x)+dud);
+			collision_segments.push_back(Vector3(b.y,0,b.x)+dud);
+
+		}
+
+		add_collision_segments(collision_segments);
+
+		Vector<Vector3> handles;
+		handles.push_back(Vector3(cs->get_radius(),0,0));
+		handles.push_back(Vector3(0,0,cs->get_height()*0.5+cs->get_radius()));
+		add_handles(handles);
+
+
+	}
+
+	if (s->cast_to<PlaneShape>()) {
+
+		Ref<PlaneShape> ps=s;
+		Plane p = ps->get_plane();
+		Vector<Vector3> points;
+
+		Vector3 n1 = p.get_any_perpendicular_normal();
+		Vector3 n2 = p.normal.cross(n1).normalized();
+
+		Vector3 pface[4]={
+			p.normal*p.d+n1*10.0+n2*10.0,
+			p.normal*p.d+n1*10.0+n2*-10.0,
+			p.normal*p.d+n1*-10.0+n2*-10.0,
+			p.normal*p.d+n1*-10.0+n2*10.0,
+		};
+
+		points.push_back(pface[0]);
+		points.push_back(pface[1]);
+		points.push_back(pface[1]);
+		points.push_back(pface[2]);
+		points.push_back(pface[2]);
+		points.push_back(pface[3]);
+		points.push_back(pface[3]);
+		points.push_back(pface[0]);
+		points.push_back(p.normal*p.d);
+		points.push_back(p.normal*p.d+p.normal*3);
+
+		add_lines(points,SpatialEditorGizmos::singleton->shape_material);
+		add_collision_segments(points);
+
+	}
+
+
+	if (s->cast_to<ConvexPolygonShape>()) {
+
+		DVector<Vector3> points = s->cast_to<ConvexPolygonShape>()->get_points();
+
+		if (points.size()>3) {
+
+			QuickHull qh;
+			Vector<Vector3> varr = Variant(points);
+			Geometry::MeshData md;
+			Error err = qh.build(varr,md);
+			if (err==OK) {
+				Vector<Vector3> points;
+				points.resize(md.edges.size()*2);
+				for(int i=0;i<md.edges.size();i++) {
+					points[i*2+0]=md.vertices[md.edges[i].a];
+					points[i*2+1]=md.vertices[md.edges[i].b];
+				}
+
+
+				add_lines(points,SpatialEditorGizmos::singleton->shape_material);
+				add_collision_segments(points);
+
+			}
+		}
+
+	}
+
+
+	if (s->cast_to<RayShape>()) {
+
+		Ref<RayShape> rs=s;
+
+		Vector<Vector3> points;
+		points.push_back(Vector3());
+		points.push_back(Vector3(0,0,rs->get_length()));
+		add_lines(points,SpatialEditorGizmos::singleton->shape_material);
+		add_collision_segments(points);
+		Vector<Vector3> handles;
+		handles.push_back(Vector3(0,0,rs->get_length()));
+		add_handles(handles);
+
+
+	}
+
+}
+CollisionShapeSpatialGizmo::CollisionShapeSpatialGizmo(CollisionShape* p_cs) {
+
+	cs=p_cs;
+	set_spatial_node(p_cs);
+}
+
+
+
+/////
+
+
+void CollisionPolygonSpatialGizmo::redraw() {
+
+	clear();
+
+	Vector<Vector2> points = polygon->get_polygon();
+	float depth = polygon->get_depth()*0.5;
+
+	Vector<Vector3> lines;
+	for(int i=0;i<points.size();i++) {
+
+		int n = (i+1)%points.size();
+		lines.push_back(Vector3(points[i].x,points[i].y,depth));
+		lines.push_back(Vector3(points[n].x,points[n].y,depth));
+		lines.push_back(Vector3(points[i].x,points[i].y,-depth));
+		lines.push_back(Vector3(points[n].x,points[n].y,-depth));
+		lines.push_back(Vector3(points[i].x,points[i].y,depth));
+		lines.push_back(Vector3(points[i].x,points[i].y,-depth));
+
+	}
+
+	add_lines(lines,SpatialEditorGizmos::singleton->shape_material);
+	add_collision_segments(lines);
+}
+
+CollisionPolygonSpatialGizmo::CollisionPolygonSpatialGizmo(CollisionPolygon* p_polygon){
+
+	set_spatial_node(p_polygon);
+	polygon=p_polygon;
+}
+///
+
+
+String VisibilityNotifierGizmo::get_handle_name(int p_idx) const {
+
+	switch(p_idx) {
+		case 0: return "X";
+		case 1: return "Y";
+		case 2: return "Z";
+	}
+
+	return "";
+}
+Variant VisibilityNotifierGizmo::get_handle_value(int p_idx) const{
+
+	return notifier->get_aabb();
+}
+void VisibilityNotifierGizmo::set_handle(int p_idx,Camera *p_camera, const Point2& p_point){
+
+
+	Transform gt = notifier->get_global_transform();
+	//gt.orthonormalize();
+	Transform gi = gt.affine_inverse();
+
+	AABB aabb = notifier->get_aabb();
+	Vector3 ray_from = p_camera->project_ray_origin(p_point);
+	Vector3 ray_dir = p_camera->project_ray_normal(p_point);
+
+	Vector3 sg[2]={gi.xform(ray_from),gi.xform(ray_from+ray_dir*4096)};
+	Vector3 ofs = aabb.pos+aabb.size*0.5;;
+
+	Vector3 axis;
+	axis[p_idx]=1.0;
+
+	Vector3 ra,rb;
+	Geometry::get_closest_points_between_segments(ofs,ofs+axis*4096,sg[0],sg[1],ra,rb);
+	float d = ra[p_idx];
+	if (d<0.001)
+		d=0.001;
+
+	Vector3 he = aabb.size;
+	aabb.pos[p_idx]=(aabb.pos[p_idx]+aabb.size[p_idx]*0.5)-d;
+	aabb.size[p_idx]=d*2;
+	notifier->set_aabb(aabb);
+}
+
+void VisibilityNotifierGizmo::commit_handle(int p_idx,const Variant& p_restore,bool p_cancel){
+
+
+	if (p_cancel) {
+		notifier->set_aabb(p_restore);
+		return;
+	}
+
+	UndoRedo *ur = SpatialEditor::get_singleton()->get_undo_redo();
+	ur->create_action("Change Notifier Extents");
+	ur->add_do_method(notifier,"set_aabb",notifier->get_aabb());
+	ur->add_undo_method(notifier,"set_aabb",p_restore);
+	ur->commit_action();
+
+}
+
+void VisibilityNotifierGizmo::redraw(){
+
+	clear();
+
+	Vector<Vector3> lines;
+	AABB aabb = notifier->get_aabb();
+
+	for(int i=0;i<12;i++) {
+		Vector3 a,b;
+		aabb.get_edge(i,a,b);
+		lines.push_back(a);
+		lines.push_back(b);
+	}
+
+	Vector<Vector3> handles;
+
+
+	for(int i=0;i<3;i++) {
+
+		Vector3 ax;
+		ax[i]=aabb.pos[i]+aabb.size[i];
+		handles.push_back(ax);
+	}
+
+	add_lines(lines,SpatialEditorGizmos::singleton->visibility_notifier_material);
+	//add_unscaled_billboard(SpatialEditorGizmos::singleton->visi,0.05);
+	add_collision_segments(lines);
+	add_handles(handles);
+
+}
+VisibilityNotifierGizmo::VisibilityNotifierGizmo(VisibilityNotifier* p_notifier){
+
+	notifier=p_notifier;
+	set_spatial_node(p_notifier);
+}
+
+////////
+
+
+
+void NavigationMeshSpatialGizmo::redraw() {
+
+	clear();
+	Ref<NavigationMesh> navmeshie = navmesh->get_navigation_mesh();
+	if (navmeshie.is_null())
+		return;
+
+	DVector<Vector3> vertices = navmeshie->get_vertices();
+	DVector<Vector3>::Read vr=vertices.read();
+	List<Face3> faces;
+	for(int i=0;i<navmeshie->get_polygon_count();i++) {
+		Vector<int> p = navmeshie->get_polygon(i);
+
+		for(int j=2;j<p.size();j++) {
+			Face3 f;
+			f.vertex[0]=vr[p[0]];
+			f.vertex[1]=vr[p[j-1]];
+			f.vertex[2]=vr[p[j]];
+
+			faces.push_back(f);
+		}
+	}
+
+
+	Map<_EdgeKey,bool> edge_map;
+	DVector<Vector3> tmeshfaces;
+	tmeshfaces.resize(faces.size()*3);
+
+	{
+		DVector<Vector3>::Write tw=tmeshfaces.write();
+		int tidx=0;
+
+
+		for(List<Face3>::Element *E=faces.front();E;E=E->next()) {
+
+			const Face3 &f = E->get();
+
+			for(int j=0;j<3;j++) {
+
+				tw[tidx++]=f.vertex[j];
+				_EdgeKey ek;
+				ek.from=f.vertex[j].snapped(CMP_EPSILON);
+				ek.to=f.vertex[(j+1)%3].snapped(CMP_EPSILON);
+				if (ek.from<ek.to)
+					SWAP(ek.from,ek.to);
+
+				Map<_EdgeKey,bool>::Element *E=edge_map.find(ek);
+
+				if (E) {
+
+					E->get()=false;
+
+				} else {
+
+					edge_map[ek]=true;
+				}
+
+			}
+		}
+	}
+	Vector<Vector3> lines;
+
+	for(Map<_EdgeKey,bool>::Element *E=edge_map.front();E;E=E->next()) {
+
+		if (E->get()) {
+			lines.push_back(E->key().from);
+			lines.push_back(E->key().to);
+		}
+	}
+
+	Ref<TriangleMesh> tmesh = memnew( TriangleMesh);
+	tmesh->create(tmeshfaces);
+
+	if (lines.size())
+		add_lines(lines,navmesh->is_enabled()?SpatialEditorGizmos::singleton->navmesh_edge_material:SpatialEditorGizmos::singleton->navmesh_edge_material_disabled);
+	add_collision_triangles(tmesh);
+	Ref<Mesh> m = memnew( Mesh );
+	Array a;
+	a.resize(Mesh::ARRAY_MAX);
+	a[0]=tmeshfaces;
+	m->add_surface(Mesh::PRIMITIVE_TRIANGLES,a);
+	m->surface_set_material(0,navmesh->is_enabled()?SpatialEditorGizmos::singleton->navmesh_solid_material:SpatialEditorGizmos::singleton->navmesh_solid_material_disabled);
+	add_mesh(m);
+	add_collision_segments(lines);
+
+}
+
+NavigationMeshSpatialGizmo::NavigationMeshSpatialGizmo(NavigationMeshInstance *p_navmesh){
+
+	set_spatial_node(p_navmesh);
+	navmesh=p_navmesh;
+}
+
+//////
+///
+///
+
+
+
+void PinJointSpatialGizmo::redraw() {
+
+	clear();
+	Vector<Vector3> cursor_points;
+	float cs = 0.25;
+	cursor_points.push_back(Vector3(+cs,0,0));
+	cursor_points.push_back(Vector3(-cs,0,0));
+	cursor_points.push_back(Vector3(0,+cs,0));
+	cursor_points.push_back(Vector3(0,-cs,0));
+	cursor_points.push_back(Vector3(0,0,+cs));
+	cursor_points.push_back(Vector3(0,0,-cs));
+	add_collision_segments(cursor_points);
+	add_lines(cursor_points,SpatialEditorGizmos::singleton->joint_material);
+
+}
+
+
+PinJointSpatialGizmo::PinJointSpatialGizmo(PinJoint* p_p3d) {
+
+	p3d=p_p3d;
+	set_spatial_node(p3d);
+}
+
+////
+
+void HingeJointSpatialGizmo::redraw() {
+
+	clear();
+	Vector<Vector3> cursor_points;
+	float cs = 0.25;
+	/*cursor_points.push_back(Vector3(+cs,0,0));
+	cursor_points.push_back(Vector3(-cs,0,0));
+	cursor_points.push_back(Vector3(0,+cs,0));
+	cursor_points.push_back(Vector3(0,-cs,0));*/
+	cursor_points.push_back(Vector3(0,0,+cs*2));
+	cursor_points.push_back(Vector3(0,0,-cs*2));
+
+	float ll = p3d->get_param(HingeJoint::PARAM_LIMIT_LOWER);
+	float ul = p3d->get_param(HingeJoint::PARAM_LIMIT_UPPER);
+
+	if (p3d->get_flag(HingeJoint::FLAG_USE_LIMIT) && ll<ul) {
+
+		const int points = 32;
+		float step = (ul-ll)/points;
+
+
+		for(int i=0;i<points;i++) {
+
+			float s = ll+i*(ul-ll)/points;
+			float n = ll+(i+1)*(ul-ll)/points;
+
+			Vector3 from=Vector3( -Math::sin(s),Math::cos(s), 0 )*cs;
+			Vector3 to=Vector3( -Math::sin(n),Math::cos(n), 0 )*cs;
+
+			if (i==points-1) {
+				cursor_points.push_back(to);
+				cursor_points.push_back(Vector3());
+			}
+			if (i==0) {
+				cursor_points.push_back(from);
+				cursor_points.push_back(Vector3());
+			}
+
+
+			cursor_points.push_back(from);
+			cursor_points.push_back(to);
+
+
+		}
+
+		cursor_points.push_back(Vector3(0,cs*1.5,0));
+		cursor_points.push_back(Vector3());
+
+	} else {
+
+
+		const int points = 32;
+
+		for(int i=0;i<points;i++) {
+
+			float s = ll+i*(Math_PI*2.0)/points;
+			float n = ll+(i+1)*(Math_PI*2.0)/points;
+
+			Vector3 from=Vector3( -Math::sin(s),Math::cos(s), 0 )*cs;
+			Vector3 to=Vector3( -Math::sin(n),Math::cos(n), 0 )*cs;
+
+			cursor_points.push_back(from);
+			cursor_points.push_back(to);
+
+		}
+
+	}
+	add_collision_segments(cursor_points);
+	add_lines(cursor_points,SpatialEditorGizmos::singleton->joint_material);
+
+}
+
+
+HingeJointSpatialGizmo::HingeJointSpatialGizmo(HingeJoint* p_p3d) {
+
+	p3d=p_p3d;
+	set_spatial_node(p3d);
+}
+
+///////
+///
+////
+
+void SliderJointSpatialGizmo::redraw() {
+
+	clear();
+	Vector<Vector3> cursor_points;
+	float cs = 0.25;
+	/*cursor_points.push_back(Vector3(+cs,0,0));
+	cursor_points.push_back(Vector3(-cs,0,0));
+	cursor_points.push_back(Vector3(0,+cs,0));
+	cursor_points.push_back(Vector3(0,-cs,0));*/
+	cursor_points.push_back(Vector3(0,0,+cs*2));
+	cursor_points.push_back(Vector3(0,0,-cs*2));
+
+	float ll = p3d->get_param(SliderJoint::PARAM_ANGULAR_LIMIT_LOWER);
+	float ul = p3d->get_param(SliderJoint::PARAM_ANGULAR_LIMIT_UPPER);
+	float lll = -p3d->get_param(SliderJoint::PARAM_LINEAR_LIMIT_LOWER);
+	float lul = -p3d->get_param(SliderJoint::PARAM_LINEAR_LIMIT_UPPER);
+
+	if (lll>lul) {
+
+		cursor_points.push_back(Vector3(lul,0,0));
+		cursor_points.push_back(Vector3(lll,0,0));
+
+		cursor_points.push_back(Vector3(lul,-cs,-cs));
+		cursor_points.push_back(Vector3(lul,-cs,cs));
+		cursor_points.push_back(Vector3(lul,-cs,cs));
+		cursor_points.push_back(Vector3(lul,cs,cs));
+		cursor_points.push_back(Vector3(lul,cs,cs));
+		cursor_points.push_back(Vector3(lul,cs,-cs));
+		cursor_points.push_back(Vector3(lul,cs,-cs));
+		cursor_points.push_back(Vector3(lul,-cs,-cs));
+
+
+		cursor_points.push_back(Vector3(lll,-cs,-cs));
+		cursor_points.push_back(Vector3(lll,-cs,cs));
+		cursor_points.push_back(Vector3(lll,-cs,cs));
+		cursor_points.push_back(Vector3(lll,cs,cs));
+		cursor_points.push_back(Vector3(lll,cs,cs));
+		cursor_points.push_back(Vector3(lll,cs,-cs));
+		cursor_points.push_back(Vector3(lll,cs,-cs));
+		cursor_points.push_back(Vector3(lll,-cs,-cs));
+
+
+	} else {
+
+		cursor_points.push_back(Vector3(+cs*2,0,0));
+		cursor_points.push_back(Vector3(-cs*2,0,0));
+
+	}
+
+	if (ll<ul) {
+
+		const int points = 32;
+		float step = (ul-ll)/points;
+
+
+		for(int i=0;i<points;i++) {
+
+			float s = ll+i*(ul-ll)/points;
+			float n = ll+(i+1)*(ul-ll)/points;
+
+			Vector3 from=Vector3(0, Math::cos(s), -Math::sin(s) )*cs;
+			Vector3 to=Vector3(0,Math::cos(n),  -Math::sin(n) )*cs;
+
+			if (i==points-1) {
+				cursor_points.push_back(to);
+				cursor_points.push_back(Vector3());
+			}
+			if (i==0) {
+				cursor_points.push_back(from);
+				cursor_points.push_back(Vector3());
+			}
+
+
+			cursor_points.push_back(from);
+			cursor_points.push_back(to);
+
+
+		}
+
+		cursor_points.push_back(Vector3(0,cs*1.5,0));
+		cursor_points.push_back(Vector3());
+
+	} else {
+
+
+		const int points = 32;
+
+		for(int i=0;i<points;i++) {
+
+			float s = ll+i*(Math_PI*2.0)/points;
+			float n = ll+(i+1)*(Math_PI*2.0)/points;
+
+			Vector3 from=Vector3(0,Math::cos(s),-Math::sin(s) )*cs;
+			Vector3 to=Vector3( 0,Math::cos(n),-Math::sin(n) )*cs;
+
+			cursor_points.push_back(from);
+			cursor_points.push_back(to);
+
+		}
+
+	}
+	add_collision_segments(cursor_points);
+	add_lines(cursor_points,SpatialEditorGizmos::singleton->joint_material);
+
+}
+
+
+SliderJointSpatialGizmo::SliderJointSpatialGizmo(SliderJoint* p_p3d) {
+
+	p3d=p_p3d;
+	set_spatial_node(p3d);
+}
+
+///////
+///
+////
+
+void ConeTwistJointSpatialGizmo::redraw() {
+
+	clear();
+	float cs = 0.25;
+	Vector<Vector3> points;
+
+	float r = 1.0;
+	float w = r*Math::sin(p3d->get_param(ConeTwistJoint::PARAM_SWING_SPAN));
+	float d = r*Math::cos(p3d->get_param(ConeTwistJoint::PARAM_SWING_SPAN));
+
+
+	//swing
+	for(int i=0;i<360;i+=10) {
+
+		float ra=Math::deg2rad(i);
+		float rb=Math::deg2rad(i+10);
+		Point2 a = Vector2(Math::sin(ra),Math::cos(ra))*w;
+		Point2 b = Vector2(Math::sin(rb),Math::cos(rb))*w;
+
+		/*points.push_back(Vector3(a.x,0,a.y));
+		points.push_back(Vector3(b.x,0,b.y));
+		points.push_back(Vector3(0,a.x,a.y));
+		points.push_back(Vector3(0,b.x,b.y));*/
+		points.push_back(Vector3(d,a.x,a.y));
+		points.push_back(Vector3(d,b.x,b.y));
+
+		if (i%90==0) {
+
+			points.push_back(Vector3(d,a.x,a.y));
+			points.push_back(Vector3());
+
+		}
+	}
+
+	points.push_back(Vector3());
+	points.push_back(Vector3(1,0,0));
+
+	//twist
+	/*
+	 */
+	float ts=Math::rad2deg(p3d->get_param(ConeTwistJoint::PARAM_TWIST_SPAN));
+	ts=MIN(ts,720);
+
+
+	for(int i=0;i<int(ts);i+=5) {
+
+		float ra=Math::deg2rad(i);
+		float rb=Math::deg2rad(i+5);
+		float c = i/720.0;
+		float cn = (i+5)/720.0;
+		Point2 a = Vector2(Math::sin(ra),Math::cos(ra))*w*c;
+		Point2 b = Vector2(Math::sin(rb),Math::cos(rb))*w*cn;
+
+		/*points.push_back(Vector3(a.x,0,a.y));
+		points.push_back(Vector3(b.x,0,b.y));
+		points.push_back(Vector3(0,a.x,a.y));
+		points.push_back(Vector3(0,b.x,b.y));*/
+
+		points.push_back(Vector3(c,a.x,a.y));
+		points.push_back(Vector3(cn,b.x,b.y));
+
+	}
+
+
+	add_collision_segments(points);
+	add_lines(points,SpatialEditorGizmos::singleton->joint_material);
+
+}
+
+
+ConeTwistJointSpatialGizmo::ConeTwistJointSpatialGizmo(ConeTwistJoint* p_p3d) {
+
+	p3d=p_p3d;
+	set_spatial_node(p3d);
+}
+
+////////
+/// \brief SpatialEditorGizmos::singleton
+///
+///////
+///
+////
+
+void Generic6DOFJointSpatialGizmo::redraw() {
+
+	clear();
+	Vector<Vector3> cursor_points;
+	float cs = 0.25;
+
+	for(int ax=0;ax<3;ax++) {
+		/*cursor_points.push_back(Vector3(+cs,0,0));
+		cursor_points.push_back(Vector3(-cs,0,0));
+		cursor_points.push_back(Vector3(0,+cs,0));
+		cursor_points.push_back(Vector3(0,-cs,0));
+		cursor_points.push_back(Vector3(0,0,+cs*2));
+		cursor_points.push_back(Vector3(0,0,-cs*2)); */
+
+		float ll;
+		float ul;
+		float lll;
+		float lul;
+
+		int a1,a2,a3;
+		bool enable_ang;
+		bool enable_lin;
+
+		switch(ax) {
+			case 0:
+				ll = p3d->get_param_x(Generic6DOFJoint::PARAM_ANGULAR_LOWER_LIMIT);
+				ul = p3d->get_param_x(Generic6DOFJoint::PARAM_ANGULAR_UPPER_LIMIT);
+				lll = -p3d->get_param_x(Generic6DOFJoint::PARAM_LINEAR_LOWER_LIMIT);
+				lul = -p3d->get_param_x(Generic6DOFJoint::PARAM_LINEAR_UPPER_LIMIT);
+				enable_ang = p3d->get_flag_x(Generic6DOFJoint::FLAG_ENABLE_ANGULAR_LIMIT);
+				enable_lin = p3d->get_flag_x(Generic6DOFJoint::FLAG_ENABLE_LINEAR_LIMIT);
+				a1=0;
+				a2=1;
+				a3=2;
+			break;
+			case 1:
+				ll = p3d->get_param_y(Generic6DOFJoint::PARAM_ANGULAR_LOWER_LIMIT);
+				ul = p3d->get_param_y(Generic6DOFJoint::PARAM_ANGULAR_UPPER_LIMIT);
+				lll = -p3d->get_param_y(Generic6DOFJoint::PARAM_LINEAR_LOWER_LIMIT);
+				lul = -p3d->get_param_y(Generic6DOFJoint::PARAM_LINEAR_UPPER_LIMIT);
+				enable_ang = p3d->get_flag_y(Generic6DOFJoint::FLAG_ENABLE_ANGULAR_LIMIT);
+				enable_lin = p3d->get_flag_y(Generic6DOFJoint::FLAG_ENABLE_LINEAR_LIMIT);
+				a1=2;
+				a2=0;
+				a3=1;
+			break;
+			case 2:
+				ll = p3d->get_param_z(Generic6DOFJoint::PARAM_ANGULAR_LOWER_LIMIT);
+				ul = p3d->get_param_z(Generic6DOFJoint::PARAM_ANGULAR_UPPER_LIMIT);
+				lll = -p3d->get_param_z(Generic6DOFJoint::PARAM_LINEAR_LOWER_LIMIT);
+				lul = -p3d->get_param_z(Generic6DOFJoint::PARAM_LINEAR_UPPER_LIMIT);
+				enable_ang = p3d->get_flag_z(Generic6DOFJoint::FLAG_ENABLE_ANGULAR_LIMIT);
+				enable_lin = p3d->get_flag_z(Generic6DOFJoint::FLAG_ENABLE_LINEAR_LIMIT);
+
+				a1=1;
+				a2=2;
+				a3=0;
+			break;
+		}
+
+#define ADD_VTX(x,y,z)\
+		{\
+			Vector3 v;\
+			v[a1]=(x);\
+			v[a2]=(y);\
+			v[a3]=(z);\
+			cursor_points.push_back(v);\
+		}
+
+#define SET_VTX(what,x,y,z)\
+		{\
+			Vector3 v;\
+			v[a1]=(x);\
+			v[a2]=(y);\
+			v[a3]=(z);\
+			what=v;\
+		}
+
+
+
+
+		if (enable_lin && lll>=lul) {
+
+			ADD_VTX(lul,0,0);
+			ADD_VTX(lll,0,0);
+
+			ADD_VTX(lul,-cs,-cs);
+			ADD_VTX(lul,-cs,cs);
+			ADD_VTX(lul,-cs,cs);
+			ADD_VTX(lul,cs,cs);
+			ADD_VTX(lul,cs,cs);
+			ADD_VTX(lul,cs,-cs);
+			ADD_VTX(lul,cs,-cs);
+			ADD_VTX(lul,-cs,-cs);
+
+
+			ADD_VTX(lll,-cs,-cs);
+			ADD_VTX(lll,-cs,cs);
+			ADD_VTX(lll,-cs,cs);
+			ADD_VTX(lll,cs,cs);
+			ADD_VTX(lll,cs,cs);
+			ADD_VTX(lll,cs,-cs);
+			ADD_VTX(lll,cs,-cs);
+			ADD_VTX(lll,-cs,-cs);
+
+
+		} else {
+
+			ADD_VTX(+cs*2,0,0);
+			ADD_VTX(-cs*2,0,0);
+
+		}
+
+		if (enable_ang && ll<=ul) {
+
+			const int points = 32;
+			float step = (ul-ll)/points;
+
+
+			for(int i=0;i<points;i++) {
+
+				float s = ll+i*(ul-ll)/points;
+				float n = ll+(i+1)*(ul-ll)/points;
+
+				Vector3 from;
+				SET_VTX(from,0, Math::cos(s), -Math::sin(s) );
+				from*=cs;
+				Vector3 to;
+				SET_VTX(to,0,Math::cos(n),  -Math::sin(n));
+				to*=cs;
+
+				if (i==points-1) {
+					cursor_points.push_back(to);
+					cursor_points.push_back(Vector3());
+				}
+				if (i==0) {
+					cursor_points.push_back(from);
+					cursor_points.push_back(Vector3());
+				}
+
+
+				cursor_points.push_back(from);
+				cursor_points.push_back(to);
+
+
+			}
+
+			ADD_VTX(0,cs*1.5,0);
+			cursor_points.push_back(Vector3());
+
+		} else {
+
+
+			const int points = 32;
+
+			for(int i=0;i<points;i++) {
+
+				float s = ll+i*(Math_PI*2.0)/points;
+				float n = ll+(i+1)*(Math_PI*2.0)/points;
+
+//				Vector3 from=Vector3(0,Math::cos(s),-Math::sin(s) )*cs;
+//				Vector3 to=Vector3( 0,Math::cos(n),-Math::sin(n) )*cs;
+
+				Vector3 from;
+				SET_VTX(from,0, Math::cos(s), -Math::sin(s) );
+				from*=cs;
+				Vector3 to;
+				SET_VTX(to,0,Math::cos(n),  -Math::sin(n));
+				to*=cs;
+
+				cursor_points.push_back(from);
+				cursor_points.push_back(to);
+
+			}
+
+		}
+	}
+
+#undef ADD_VTX
+#undef SET_VTX
+
+	add_collision_segments(cursor_points);
+	add_lines(cursor_points,SpatialEditorGizmos::singleton->joint_material);
+
+}
+
+
+Generic6DOFJointSpatialGizmo::Generic6DOFJointSpatialGizmo(Generic6DOFJoint* p_p3d) {
+
+	p3d=p_p3d;
+	set_spatial_node(p3d);
+}
+
+///////
+///
+////
+
+
+SpatialEditorGizmos *SpatialEditorGizmos::singleton=NULL;
+
+Ref<SpatialEditorGizmo> SpatialEditorGizmos::get_gizmo(Spatial *p_spatial) {
+
+	if (p_spatial->cast_to<Light>()) {
+
+		Ref<LightSpatialGizmo> lsg = memnew( LightSpatialGizmo(p_spatial->cast_to<Light>()) );
+		return lsg;
+	}
+
+	if (p_spatial->cast_to<Camera>()) {
+
+		Ref<CameraSpatialGizmo> lsg = memnew( CameraSpatialGizmo(p_spatial->cast_to<Camera>()) );
+		return lsg;
+	}
+
+	if (p_spatial->cast_to<Skeleton>()) {
+
+		Ref<SkeletonSpatialGizmo> lsg = memnew( SkeletonSpatialGizmo(p_spatial->cast_to<Skeleton>()) );
+		return lsg;
+	}
+
+
+	if (p_spatial->cast_to<Position3D>()) {
+
+		Ref<Position3DSpatialGizmo> lsg = memnew( Position3DSpatialGizmo(p_spatial->cast_to<Position3D>()) );
+		return lsg;
+	}
+
+	if (p_spatial->cast_to<MeshInstance>()) {
+
+		Ref<MeshInstanceSpatialGizmo> misg = memnew( MeshInstanceSpatialGizmo(p_spatial->cast_to<MeshInstance>()) );
+		return misg;
+	}
+
+	if (p_spatial->cast_to<Room>()) {
+
+		Ref<RoomSpatialGizmo> misg = memnew( RoomSpatialGizmo(p_spatial->cast_to<Room>()) );
+		return misg;
+	}
+
+	if (p_spatial->cast_to<NavigationMeshInstance>()) {
+
+		Ref<NavigationMeshSpatialGizmo> misg = memnew( NavigationMeshSpatialGizmo(p_spatial->cast_to<NavigationMeshInstance>()) );
+		return misg;
+	}
+
+	if (p_spatial->cast_to<RayCast>()) {
+
+		Ref<RayCastSpatialGizmo> misg = memnew( RayCastSpatialGizmo(p_spatial->cast_to<RayCast>()) );
+		return misg;
+	}
+
+	if (p_spatial->cast_to<Portal>()) {
+
+		Ref<PortalSpatialGizmo> misg = memnew( PortalSpatialGizmo(p_spatial->cast_to<Portal>()) );
+		return misg;
+	}
+
+
+	if (p_spatial->cast_to<TestCube>()) {
+
+		Ref<TestCubeSpatialGizmo> misg = memnew( TestCubeSpatialGizmo(p_spatial->cast_to<TestCube>()) );
+		return misg;
+	}
+
+	if (p_spatial->cast_to<SpatialPlayer>()) {
+
+		Ref<SpatialPlayerSpatialGizmo> misg = memnew( SpatialPlayerSpatialGizmo(p_spatial->cast_to<SpatialPlayer>()) );
+		return misg;
+	}
+
+	if (p_spatial->cast_to<CollisionShape>()) {
+
+		Ref<CollisionShapeSpatialGizmo> misg = memnew( CollisionShapeSpatialGizmo(p_spatial->cast_to<CollisionShape>()) );
+		return misg;
+	}
+
+	if (p_spatial->cast_to<VisibilityNotifier>()) {
+
+		Ref<VisibilityNotifierGizmo> misg = memnew( VisibilityNotifierGizmo(p_spatial->cast_to<VisibilityNotifier>()) );
+		return misg;
+	}
+
+	if (p_spatial->cast_to<VehicleWheel>()) {
+
+		Ref<VehicleWheelSpatialGizmo> misg = memnew( VehicleWheelSpatialGizmo(p_spatial->cast_to<VehicleWheel>()) );
+		return misg;
+	}
+	if (p_spatial->cast_to<PinJoint>()) {
+
+		Ref<PinJointSpatialGizmo> misg = memnew( PinJointSpatialGizmo(p_spatial->cast_to<PinJoint>()) );
+		return misg;
+	}
+
+	if (p_spatial->cast_to<HingeJoint>()) {
+
+		Ref<HingeJointSpatialGizmo> misg = memnew( HingeJointSpatialGizmo(p_spatial->cast_to<HingeJoint>()) );
+		return misg;
+	}
+
+	if (p_spatial->cast_to<SliderJoint>()) {
+
+		Ref<SliderJointSpatialGizmo> misg = memnew( SliderJointSpatialGizmo(p_spatial->cast_to<SliderJoint>()) );
+		return misg;
+	}
+
+	if (p_spatial->cast_to<ConeTwistJoint>()) {
+
+		Ref<ConeTwistJointSpatialGizmo> misg = memnew( ConeTwistJointSpatialGizmo(p_spatial->cast_to<ConeTwistJoint>()) );
+		return misg;
+	}
+
+	if (p_spatial->cast_to<Generic6DOFJoint>()) {
+
+		Ref<Generic6DOFJointSpatialGizmo> misg = memnew( Generic6DOFJointSpatialGizmo(p_spatial->cast_to<Generic6DOFJoint>()) );
+		return misg;
+	}
+
+	if (p_spatial->cast_to<CollisionPolygon>()) {
+
+		Ref<CollisionPolygonSpatialGizmo> misg = memnew( CollisionPolygonSpatialGizmo(p_spatial->cast_to<CollisionPolygon>()) );
+		return misg;
+	}
+
+
+	return Ref<SpatialEditorGizmo>();
+}
+
+
+Ref<FixedMaterial> SpatialEditorGizmos::create_line_material(const Color& p_base_color) {
+
+	Ref<FixedMaterial> line_material = Ref<FixedMaterial>( memnew( FixedMaterial ));
+	line_material->set_flag(Material::FLAG_UNSHADED, true);
+	line_material->set_line_width(3.0);
+	line_material->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA, true);
+	line_material->set_fixed_flag(FixedMaterial::FLAG_USE_COLOR_ARRAY, true);
+	line_material->set_parameter(FixedMaterial::PARAM_DIFFUSE,p_base_color);
+
+	return line_material;
+
+}
+
+Ref<FixedMaterial> SpatialEditorGizmos::create_solid_material(const Color& p_base_color) {
+
+	Ref<FixedMaterial> line_material = Ref<FixedMaterial>( memnew( FixedMaterial ));
+	line_material->set_flag(Material::FLAG_UNSHADED, true);
+	line_material->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA, true);
+	line_material->set_parameter(FixedMaterial::PARAM_DIFFUSE,p_base_color);
+
+	return line_material;
+
+}
+
+SpatialEditorGizmos::SpatialEditorGizmos() {
+
+	singleton=this;
+
+	handle_material = Ref<FixedMaterial>( memnew( FixedMaterial ));
+	handle_material->set_flag(Material::FLAG_UNSHADED, true);
+	handle_material->set_parameter(FixedMaterial::PARAM_DIFFUSE,Color(0.8,0.8,0.8));
+
+	handle2_material = Ref<FixedMaterial>( memnew( FixedMaterial ));
+	handle2_material->set_flag(Material::FLAG_UNSHADED, true);
+	handle2_material->set_fixed_flag(FixedMaterial::FLAG_USE_POINT_SIZE, true);
+	handle_t = SpatialEditor::get_singleton()->get_icon("Editor3DHandle","EditorIcons");
+	handle2_material->set_point_size(handle_t->get_width());
+	handle2_material->set_texture(FixedMaterial::PARAM_DIFFUSE,handle_t);
+	handle2_material->set_parameter(FixedMaterial::PARAM_DIFFUSE,Color(1,1,1));
+	handle2_material->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA, true);
+	handle2_material->set_fixed_flag(FixedMaterial::FLAG_USE_COLOR_ARRAY, true);
+
+	light_material = create_line_material(Color(1,1,0.2));
+
+	light_material_omni_icon = Ref<FixedMaterial>( memnew( FixedMaterial ));
+	light_material_omni_icon->set_flag(Material::FLAG_UNSHADED, true);
+	light_material_omni_icon->set_flag(Material::FLAG_DOUBLE_SIDED, true);
+	light_material_omni_icon->set_depth_draw_mode(Material::DEPTH_DRAW_NEVER);
+	light_material_omni_icon->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA, true);
+	light_material_omni_icon->set_parameter(FixedMaterial::PARAM_DIFFUSE,Color(1,1,1,0.9));
+	light_material_omni_icon->set_texture(FixedMaterial::PARAM_DIFFUSE,SpatialEditor::get_singleton()->get_icon("GizmoLight","EditorIcons"));
+
+
+	light_material_directional_icon = Ref<FixedMaterial>( memnew( FixedMaterial ));
+	light_material_directional_icon->set_flag(Material::FLAG_UNSHADED, true);
+	light_material_directional_icon->set_flag(Material::FLAG_DOUBLE_SIDED, true);
+	light_material_directional_icon->set_depth_draw_mode(Material::DEPTH_DRAW_NEVER);
+	light_material_directional_icon->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA, true);
+	light_material_directional_icon->set_parameter(FixedMaterial::PARAM_DIFFUSE,Color(1,1,1,0.9));
+	light_material_directional_icon->set_texture(FixedMaterial::PARAM_DIFFUSE,SpatialEditor::get_singleton()->get_icon("GizmoDirectionalLight","EditorIcons"));
+
+	camera_material = create_line_material(Color(1.0,0.5,1.0));
+
+
+	navmesh_edge_material = create_line_material(Color(0.1,0.8,1.0));
+	navmesh_solid_material = create_solid_material(Color(0.1,0.8,1.0,0.4));
+	navmesh_edge_material->set_fixed_flag(FixedMaterial::FLAG_USE_COLOR_ARRAY, false);
+	navmesh_solid_material->set_flag(Material::FLAG_DOUBLE_SIDED,true);
+
+	navmesh_edge_material_disabled = create_line_material(Color(1.0,0.8,0.1));
+	navmesh_solid_material_disabled = create_solid_material(Color(1.0,0.8,0.1,0.4));
+	navmesh_edge_material_disabled->set_fixed_flag(FixedMaterial::FLAG_USE_COLOR_ARRAY, false);
+	navmesh_solid_material_disabled->set_flag(Material::FLAG_DOUBLE_SIDED,true);
+
+	skeleton_material = create_line_material(Color(0.6,1.0,0.3));
+	skeleton_material->set_flag(Material::FLAG_DOUBLE_SIDED,true);
+	skeleton_material->set_flag(Material::FLAG_UNSHADED,true);
+	skeleton_material->set_flag(Material::FLAG_ONTOP,true);
+	skeleton_material->set_depth_draw_mode(Material::DEPTH_DRAW_NEVER);
+
+	//position 3D Shared mesh
+
+	pos3d_mesh = Ref<Mesh>( memnew( Mesh ) );
+	{
+
+		DVector<Vector3> cursor_points;
+		DVector<Color> cursor_colors;
+		float cs = 0.25;
+		cursor_points.push_back(Vector3(+cs,0,0));
+		cursor_points.push_back(Vector3(-cs,0,0));
+		cursor_points.push_back(Vector3(0,+cs,0));
+		cursor_points.push_back(Vector3(0,-cs,0));
+		cursor_points.push_back(Vector3(0,0,+cs));
+		cursor_points.push_back(Vector3(0,0,-cs));
+		cursor_colors.push_back(Color(1,0.5,0.5,0.7));
+		cursor_colors.push_back(Color(1,0.5,0.5,0.7));
+		cursor_colors.push_back(Color(0.5,1,0.5,0.7));
+		cursor_colors.push_back(Color(0.5,1,0.5,0.7));
+		cursor_colors.push_back(Color(0.5,0.5,1,0.7));
+		cursor_colors.push_back(Color(0.5,0.5,1,0.7));
+
+		Ref<FixedMaterial> mat = memnew( FixedMaterial );
+		mat->set_flag(Material::FLAG_UNSHADED,true);
+		mat->set_fixed_flag(FixedMaterial::FLAG_USE_COLOR_ARRAY,true);
+		mat->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA,true);
+		mat->set_line_width(3);
+		Array d;
+		d.resize(VS::ARRAY_MAX);
+		d[Mesh::ARRAY_VERTEX]=cursor_points;
+		d[Mesh::ARRAY_COLOR]=cursor_colors;
+		pos3d_mesh->add_surface(Mesh::PRIMITIVE_LINES,d);
+		pos3d_mesh->surface_set_material(0,mat);
+	}
+
+
+	sample_player_icon = Ref<FixedMaterial>( memnew( FixedMaterial ));
+	sample_player_icon->set_flag(Material::FLAG_UNSHADED, true);
+	sample_player_icon->set_flag(Material::FLAG_DOUBLE_SIDED, true);
+	sample_player_icon->set_depth_draw_mode(Material::DEPTH_DRAW_NEVER);
+	sample_player_icon->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA, true);
+	sample_player_icon->set_parameter(FixedMaterial::PARAM_DIFFUSE,Color(1,1,1,0.9));
+	sample_player_icon->set_texture(FixedMaterial::PARAM_DIFFUSE,SpatialEditor::get_singleton()->get_icon("GizmoSpatialSamplePlayer","EditorIcons"));
+
+	room_material = create_line_material(Color(1.0,0.6,0.9));
+	portal_material = create_line_material(Color(1.0,0.8,0.6));
+	raycast_material = create_line_material(Color(1.0,0.8,0.6));
+	car_wheel_material = create_line_material(Color(0.6,0.8,1.0));
+	visibility_notifier_material = create_line_material(Color(1.0,0.5,1.0));
+	joint_material = create_line_material(Color(0.6,0.8,1.0));
+
+	stream_player_icon = Ref<FixedMaterial>( memnew( FixedMaterial ));
+	stream_player_icon->set_flag(Material::FLAG_UNSHADED, true);
+	stream_player_icon->set_flag(Material::FLAG_DOUBLE_SIDED, true);
+	stream_player_icon->set_depth_draw_mode(Material::DEPTH_DRAW_NEVER);
+	stream_player_icon->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA, true);
+	stream_player_icon->set_parameter(FixedMaterial::PARAM_DIFFUSE,Color(1,1,1,0.9));
+	stream_player_icon->set_texture(FixedMaterial::PARAM_DIFFUSE,SpatialEditor::get_singleton()->get_icon("GizmoSpatialStreamPlayer","EditorIcons"));
+
+	visibility_notifier_icon = Ref<FixedMaterial>( memnew( FixedMaterial ));
+	visibility_notifier_icon->set_flag(Material::FLAG_UNSHADED, true);
+	visibility_notifier_icon->set_flag(Material::FLAG_DOUBLE_SIDED, true);
+	visibility_notifier_icon->set_depth_draw_mode(Material::DEPTH_DRAW_NEVER);
+	visibility_notifier_icon->set_fixed_flag(FixedMaterial::FLAG_USE_ALPHA, true);
+	visibility_notifier_icon->set_parameter(FixedMaterial::PARAM_DIFFUSE,Color(1,1,1,0.9));
+	visibility_notifier_icon->set_texture(FixedMaterial::PARAM_DIFFUSE,SpatialEditor::get_singleton()->get_icon("Visible","EditorIcons"));
+
+	{
+
+		DVector<Vector3> vertices;
+
+#undef ADD_VTX
+#define ADD_VTX(m_idx);\
+	vertices.push_back( face_points[m_idx] );
+
+		for (int i=0;i<6;i++) {
+
+
+			Vector3 face_points[4];
+
+			for (int j=0;j<4;j++) {
+
+				float v[3];
+				v[0]=1.0;
+				v[1]=1-2*((j>>1)&1);
+				v[2]=v[1]*(1-2*(j&1));
+
+				for (int k=0;k<3;k++) {
+
+					if (i<3)
+						face_points[j][(i+k)%3]=v[k]*(i>=3?-1:1);
+					else
+						face_points[3-j][(i+k)%3]=v[k]*(i>=3?-1:1);
+				}
+			}
+			//tri 1
+			ADD_VTX(0);
+			ADD_VTX(1);
+			ADD_VTX(2);
+			//tri 2
+			ADD_VTX(2);
+			ADD_VTX(3);
+			ADD_VTX(0);
+
+		}
+
+		test_cube_tm = Ref<TriangleMesh>( memnew( TriangleMesh ) );
+		test_cube_tm->create(vertices);
+	}
+
+	shape_material = create_line_material(Color(0.2,1,1.0));
+
+
+}
+
diff --git a/tools/editor/spatial_editor_gizmos.h b/tools/editor/spatial_editor_gizmos.h
index 8d6730e2f1..bc7e8ad21d 100644
--- a/tools/editor/spatial_editor_gizmos.h
+++ b/tools/editor/spatial_editor_gizmos.h
@@ -1,487 +1,491 @@
-/*************************************************************************/

-/*  spatial_editor_gizmos.h                                              */

-/*************************************************************************/

-/*                       This file is part of:                           */

-/*                           GODOT ENGINE                                */

-/*                    http://www.godotengine.org                         */

-/*************************************************************************/

-/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */

-/*                                                                       */

-/* Permission is hereby granted, free of charge, to any person obtaining */

-/* a copy of this software and associated documentation files (the       */

-/* "Software"), to deal in the Software without restriction, including   */

-/* without limitation the rights to use, copy, modify, merge, publish,   */

-/* distribute, sublicense, and/or sell copies of the Software, and to    */

-/* permit persons to whom the Software is furnished to do so, subject to */

-/* the following conditions:                                             */

-/*                                                                       */

-/* The above copyright notice and this permission notice shall be        */

-/* included in all copies or substantial portions of the Software.       */

-/*                                                                       */

-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */

-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */

-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/

-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */

-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */

-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */

-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */

-/*************************************************************************/

-#ifndef SPATIAL_EDITOR_GIZMOS_H

-#define SPATIAL_EDITOR_GIZMOS_H

-

-

-#include "tools/editor/plugins/spatial_editor_plugin.h"

-#include "scene/3d/light.h"

-#include "scene/3d/camera.h"

-#include "scene/3d/position_3d.h"

-#include "scene/3d/spatial_sample_player.h"

-#include "scene/3d/spatial_stream_player.h"

-#include "scene/3d/test_cube.h"

-#include "scene/3d/mesh_instance.h"

-#include "scene/3d/body_shape.h"

-#include "scene/3d/room_instance.h"

-#include "scene/3d/visibility_notifier.h"

-#include "scene/3d/portal.h"

-#include "scene/3d/ray_cast.h"

-#include "scene/3d/navigation_mesh.h"

-

-#include "scene/3d/vehicle_body.h"

-#include "scene/3d/collision_polygon.h"

-#include "scene/3d/physics_joint.h"

-

-

-class Camera;

-

-class SpatialGizmoTool  : public SpatialEditorGizmo {

-

-	OBJ_TYPE(SpatialGizmoTool,SpatialGizmo);

-

-	struct Instance{

-

-		RID instance;

-		Ref<Mesh> mesh;

-		RID skeleton;

-		bool billboard;

-		bool unscaled;

-		bool can_intersect;

-		bool extra_margin;

-		Instance() {

-

-			billboard=false;

-			unscaled=false;

-			can_intersect=false;

-			extra_margin=false;

-		}

-

-		void create_instance(Spatial *p_base);

-

-	};

-

-	Vector<Vector3> collision_segments;

-	Ref<TriangleMesh> collision_mesh;

-

-	struct Handle {

-		Vector3 pos;

-		bool billboard;

-	};

-

-	Vector<Vector3> handles;

-	Vector<Vector3> secondary_handles;

-	bool billboard_handle;

-

-	bool valid;

-	Spatial *base;

-	Vector<Instance> instances;

-	Spatial *spatial_node;

-protected:

-	void add_lines(const Vector<Vector3> &p_lines,const Ref<Material>& p_material,bool p_billboard=false);

-	void add_mesh(const Ref<Mesh>& p_mesh,bool p_billboard=false,const RID& p_skeleton=RID());

-	void add_collision_segments(const Vector<Vector3> &p_lines);

-	void add_collision_triangles(const Ref<TriangleMesh>& p_tmesh);

-	void add_unscaled_billboard(const Ref<Material>& p_material,float p_scale=1);

-	void add_handles(const Vector<Vector3> &p_handles,bool p_billboard=false,bool p_secondary=false);

-

-	void set_spatial_node(Spatial *p_node);

-

-public:

-

-	virtual Vector3 get_handle_pos(int p_idx) const;

-	virtual bool intersect_frustum(const Camera *p_camera,const Vector<Plane> &p_frustum);

-	virtual bool intersect_ray(const Camera *p_camera,const Point2& p_point,  Vector3& r_pos, Vector3& r_normal,int *r_gizmo_handle=NULL,bool p_sec_first=false);

-

-	void clear();

-	void create();

-	void transform();

-	//void redraw();

-	void free();

-

-	SpatialGizmoTool();

-	~SpatialGizmoTool();

-};

-

-

-

-class LightSpatialGizmo  : public SpatialGizmoTool {

-

-	OBJ_TYPE(LightSpatialGizmo,SpatialGizmoTool);

-

-	Light* light;

-

-public:

-

-

-	virtual String get_handle_name(int p_idx) const;

-	virtual Variant get_handle_value(int p_idx) const;

-	virtual void set_handle(int p_idx,Camera *p_camera, const Point2& p_point);

-	virtual void commit_handle(int p_idx,const Variant& p_restore,bool p_cancel=false);

-

-	void redraw();

-	LightSpatialGizmo(Light* p_light=NULL);

-

-};

-

-class CameraSpatialGizmo  : public SpatialGizmoTool {

-

-	OBJ_TYPE(CameraSpatialGizmo,SpatialGizmoTool);

-

-	Camera* camera;

-

-public:

-

-

-	virtual String get_handle_name(int p_idx) const;

-	virtual Variant get_handle_value(int p_idx) const;

-	virtual void set_handle(int p_idx,Camera *p_camera, const Point2& p_point);

-	virtual void commit_handle(int p_idx,const Variant& p_restore,bool p_cancel=false);

-

-	void redraw();

-	CameraSpatialGizmo(Camera* p_camera=NULL);

-

-};

-

-

-

-class MeshInstanceSpatialGizmo  : public SpatialGizmoTool {

-

-	OBJ_TYPE(MeshInstanceSpatialGizmo,SpatialGizmoTool);

-

-	MeshInstance* mesh;

-

-public:

-

-	void redraw();

-	MeshInstanceSpatialGizmo(MeshInstance* p_mesh=NULL);

-

-};

-

-class Position3DSpatialGizmo  : public SpatialGizmoTool {

-

-	OBJ_TYPE(Position3DSpatialGizmo,SpatialGizmoTool);

-

-	Position3D* p3d;

-

-public:

-

-	void redraw();

-	Position3DSpatialGizmo(Position3D* p_p3d=NULL);

-

-};

-

-class SkeletonSpatialGizmo  : public SpatialGizmoTool {

-

-	OBJ_TYPE(SkeletonSpatialGizmo,SpatialGizmoTool);

-

-	Skeleton* skel;

-

-public:

-

-	void redraw();

-	SkeletonSpatialGizmo(Skeleton* p_skel=NULL);

-

-};

-

-

-class SpatialPlayerSpatialGizmo  : public SpatialGizmoTool {

-

-	OBJ_TYPE(SpatialPlayerSpatialGizmo,SpatialGizmoTool);

-

-	SpatialPlayer* splayer;

-

-public:

-

-	void redraw();

-	SpatialPlayerSpatialGizmo(SpatialPlayer* p_splayer=NULL);

-

-};

-

-class TestCubeSpatialGizmo  : public SpatialGizmoTool {

-

-	OBJ_TYPE(TestCubeSpatialGizmo,SpatialGizmoTool);

-

-	TestCube* tc;

-

-public:

-	void redraw();

-	TestCubeSpatialGizmo(TestCube* p_tc=NULL);

-

-};

-

-

-class RoomSpatialGizmo  : public SpatialGizmoTool {

-

-	OBJ_TYPE(RoomSpatialGizmo,SpatialGizmoTool);

-

-

-	struct _EdgeKey {

-

-		Vector3 from;

-		Vector3 to;

-

-		bool operator<(const _EdgeKey& p_with) const { return from==p_with.from ? to < p_with.to : from < p_with.from; }

-	};

-

-

-

-	Room* room;

-

-public:

-

-	void redraw();

-	RoomSpatialGizmo(Room* p_room=NULL);

-

-};

-

-

-class PortalSpatialGizmo  : public SpatialGizmoTool {

-

-	OBJ_TYPE(PortalSpatialGizmo,SpatialGizmoTool);

-

-	Portal* portal;

-

-public:

-

-	void redraw();

-	PortalSpatialGizmo(Portal* p_portal=NULL);

-

-};

-

-

-class VisibilityNotifierGizmo  : public SpatialGizmoTool {

-

-	OBJ_TYPE(VisibilityNotifierGizmo ,SpatialGizmoTool);

-

-

-	VisibilityNotifier* notifier;

-

-public:

-

-	virtual String get_handle_name(int p_idx) const;

-	virtual Variant get_handle_value(int p_idx) const;

-	virtual void set_handle(int p_idx,Camera *p_camera, const Point2& p_point);

-	virtual void commit_handle(int p_idx,const Variant& p_restore,bool p_cancel=false);

-

-	void redraw();

-	VisibilityNotifierGizmo(VisibilityNotifier* p_notifier=NULL);

-

-};

-

-

-

-class CollisionShapeSpatialGizmo  : public SpatialGizmoTool {

-

-	OBJ_TYPE(CollisionShapeSpatialGizmo,SpatialGizmoTool);

-

-	CollisionShape* cs;

-

-public:

-	virtual String get_handle_name(int p_idx) const;

-	virtual Variant get_handle_value(int p_idx) const;

-	virtual void set_handle(int p_idx,Camera *p_camera, const Point2& p_point);

-	virtual void commit_handle(int p_idx,const Variant& p_restore,bool p_cancel=false);

-	void redraw();

-	CollisionShapeSpatialGizmo(CollisionShape* p_cs=NULL);

-

-};

-

-

-class CollisionPolygonSpatialGizmo  : public SpatialGizmoTool {

-

-	OBJ_TYPE(CollisionPolygonSpatialGizmo,SpatialGizmoTool);

-

-	CollisionPolygon* polygon;

-

-public:

-

-	void redraw();

-	CollisionPolygonSpatialGizmo(CollisionPolygon* p_polygon=NULL);

-

-};

-

-

-class RayCastSpatialGizmo  : public SpatialGizmoTool {

-

-	OBJ_TYPE(RayCastSpatialGizmo,SpatialGizmoTool);

-

-	RayCast* raycast;

-

-public:

-

-	void redraw();

-	RayCastSpatialGizmo(RayCast* p_raycast=NULL);

-

-};

-

-

-

-class VehicleWheelSpatialGizmo  : public SpatialGizmoTool {

-

-	OBJ_TYPE(VehicleWheelSpatialGizmo,SpatialGizmoTool);

-

-	VehicleWheel* car_wheel;

-

-public:

-

-	void redraw();

-	VehicleWheelSpatialGizmo(VehicleWheel* p_car_wheel=NULL);

-

-};

-

-

-class NavigationMeshSpatialGizmo  : public SpatialGizmoTool {

-

-	OBJ_TYPE(NavigationMeshSpatialGizmo,SpatialGizmoTool);

-

-

-	struct _EdgeKey {

-

-		Vector3 from;

-		Vector3 to;

-

-		bool operator<(const _EdgeKey& p_with) const { return from==p_with.from ? to < p_with.to : from < p_with.from; }

-	};

-

-

-

-	NavigationMeshInstance* navmesh;

-

-public:

-

-	void redraw();

-	NavigationMeshSpatialGizmo(NavigationMeshInstance* p_navmesh=NULL);

-

-};

-

-

-class PinJointSpatialGizmo  : public SpatialGizmoTool {

-

-	OBJ_TYPE(PinJointSpatialGizmo,SpatialGizmoTool);

-

-	PinJoint* p3d;

-

-public:

-

-	void redraw();

-	PinJointSpatialGizmo(PinJoint* p_p3d=NULL);

-

-};

-

-

-class HingeJointSpatialGizmo  : public SpatialGizmoTool {

-

-	OBJ_TYPE(HingeJointSpatialGizmo,SpatialGizmoTool);

-

-	HingeJoint* p3d;

-

-public:

-

-	void redraw();

-	HingeJointSpatialGizmo(HingeJoint* p_p3d=NULL);

-

-};

-

-class SliderJointSpatialGizmo  : public SpatialGizmoTool {

-

-	OBJ_TYPE(SliderJointSpatialGizmo,SpatialGizmoTool);

-

-	SliderJoint* p3d;

-

-public:

-

-	void redraw();

-	SliderJointSpatialGizmo(SliderJoint* p_p3d=NULL);

-

-};

-

-class ConeTwistJointSpatialGizmo  : public SpatialGizmoTool {

-

-	OBJ_TYPE(ConeTwistJointSpatialGizmo,SpatialGizmoTool);

-

-	ConeTwistJoint* p3d;

-

-public:

-

-	void redraw();

-	ConeTwistJointSpatialGizmo(ConeTwistJoint* p_p3d=NULL);

-

-};

-

-

-class Generic6DOFJointSpatialGizmo  : public SpatialGizmoTool {

-

-	OBJ_TYPE(Generic6DOFJointSpatialGizmo,SpatialGizmoTool);

-

-	Generic6DOFJoint* p3d;

-

-public:

-

-	void redraw();

-	Generic6DOFJointSpatialGizmo(Generic6DOFJoint* p_p3d=NULL);

-

-};

-

-

-class SpatialEditorGizmos  {

-public:

-

-	Ref<FixedMaterial> create_line_material(const Color& p_base_color);

-	Ref<FixedMaterial> create_solid_material(const Color& p_base_color);

-	Ref<FixedMaterial> handle2_material;

-	Ref<FixedMaterial> handle_material;

-	Ref<FixedMaterial> light_material;

-	Ref<FixedMaterial> light_material_omni_icon;

-	Ref<FixedMaterial> light_material_directional_icon;

-	Ref<FixedMaterial> camera_material;

-	Ref<FixedMaterial> skeleton_material;

-	Ref<FixedMaterial> room_material;

-	Ref<FixedMaterial> portal_material;

-	Ref<FixedMaterial> raycast_material;

-	Ref<FixedMaterial> visibility_notifier_material;

-	Ref<FixedMaterial> car_wheel_material;

-	Ref<FixedMaterial> joint_material;

-

-	Ref<FixedMaterial> navmesh_edge_material;

-	Ref<FixedMaterial> navmesh_solid_material;

-	Ref<FixedMaterial> navmesh_edge_material_disabled;

-	Ref<FixedMaterial> navmesh_solid_material_disabled;

-

-

-	Ref<FixedMaterial> sample_player_icon;

-	Ref<FixedMaterial> stream_player_icon;

-	Ref<FixedMaterial> visibility_notifier_icon;

-

-	Ref<FixedMaterial> shape_material;

-	Ref<Texture> handle_t;

-

-	Ref<Mesh> pos3d_mesh;

-	static SpatialEditorGizmos *singleton;

-

-	Ref<TriangleMesh> test_cube_tm;

-

-

-	Ref<SpatialEditorGizmo> get_gizmo(Spatial *p_spatial);

-

-	SpatialEditorGizmos();

-};

-

-#endif // SPATIAL_EDITOR_GIZMOS_H

-

+/*************************************************************************/
+/*  spatial_editor_gizmos.h                                              */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2015 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* Permission is hereby granted, free of charge, to any person obtaining */
+/* a copy of this software and associated documentation files (the       */
+/* "Software"), to deal in the Software without restriction, including   */
+/* without limitation the rights to use, copy, modify, merge, publish,   */
+/* distribute, sublicense, and/or sell copies of the Software, and to    */
+/* permit persons to whom the Software is furnished to do so, subject to */
+/* the following conditions:                                             */
+/*                                                                       */
+/* The above copyright notice and this permission notice shall be        */
+/* included in all copies or substantial portions of the Software.       */
+/*                                                                       */
+/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,       */
+/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF    */
+/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
+/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY  */
+/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,  */
+/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
+/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
+/*************************************************************************/
+#ifndef SPATIAL_EDITOR_GIZMOS_H
+#define SPATIAL_EDITOR_GIZMOS_H
+
+
+#include "tools/editor/plugins/spatial_editor_plugin.h"
+#include "scene/3d/light.h"
+#include "scene/3d/camera.h"
+#include "scene/3d/position_3d.h"
+#include "scene/3d/spatial_sample_player.h"
+#include "scene/3d/spatial_stream_player.h"
+#include "scene/3d/test_cube.h"
+#include "scene/3d/mesh_instance.h"
+#include "scene/3d/body_shape.h"
+#include "scene/3d/room_instance.h"
+#include "scene/3d/visibility_notifier.h"
+#include "scene/3d/portal.h"
+#include "scene/3d/ray_cast.h"
+#include "scene/3d/navigation_mesh.h"
+
+#include "scene/3d/vehicle_body.h"
+#include "scene/3d/collision_polygon.h"
+#include "scene/3d/physics_joint.h"
+
+
+class Camera;
+
+class SpatialGizmoTool  : public SpatialEditorGizmo {
+
+	OBJ_TYPE(SpatialGizmoTool,SpatialGizmo);
+
+	struct Instance{
+
+		RID instance;
+		Ref<Mesh> mesh;
+		RID skeleton;
+		bool billboard;
+		bool unscaled;
+		bool can_intersect;
+		bool extra_margin;
+		Instance() {
+
+			billboard=false;
+			unscaled=false;
+			can_intersect=false;
+			extra_margin=false;
+		}
+
+		void create_instance(Spatial *p_base);
+
+	};
+
+	Vector<Vector3> collision_segments;
+	Ref<TriangleMesh> collision_mesh;
+
+	struct Handle {
+		Vector3 pos;
+		bool billboard;
+	};
+
+	Vector<Vector3> handles;
+	Vector<Vector3> secondary_handles;
+	bool billboard_handle;
+
+	bool valid;
+	Spatial *base;
+	Vector<Instance> instances;
+	Spatial *spatial_node;
+protected:
+	void add_lines(const Vector<Vector3> &p_lines,const Ref<Material>& p_material,bool p_billboard=false);
+	void add_mesh(const Ref<Mesh>& p_mesh,bool p_billboard=false,const RID& p_skeleton=RID());
+	void add_collision_segments(const Vector<Vector3> &p_lines);
+	void add_collision_triangles(const Ref<TriangleMesh>& p_tmesh);
+	void add_unscaled_billboard(const Ref<Material>& p_material,float p_scale=1);
+	void add_handles(const Vector<Vector3> &p_handles,bool p_billboard=false,bool p_secondary=false);
+
+	void set_spatial_node(Spatial *p_node);
+
+public:
+
+	virtual Vector3 get_handle_pos(int p_idx) const;
+	virtual bool intersect_frustum(const Camera *p_camera,const Vector<Plane> &p_frustum);
+	virtual bool intersect_ray(const Camera *p_camera,const Point2& p_point,  Vector3& r_pos, Vector3& r_normal,int *r_gizmo_handle=NULL,bool p_sec_first=false);
+
+	void clear();
+	void create();
+	void transform();
+	//void redraw();
+	void free();
+
+	SpatialGizmoTool();
+	~SpatialGizmoTool();
+};
+
+
+
+class LightSpatialGizmo  : public SpatialGizmoTool {
+
+	OBJ_TYPE(LightSpatialGizmo,SpatialGizmoTool);
+
+	Light* light;
+
+public:
+
+
+	virtual String get_handle_name(int p_idx) const;
+	virtual Variant get_handle_value(int p_idx) const;
+	virtual void set_handle(int p_idx,Camera *p_camera, const Point2& p_point);
+	virtual void commit_handle(int p_idx,const Variant& p_restore,bool p_cancel=false);
+
+	void redraw();
+	LightSpatialGizmo(Light* p_light=NULL);
+
+};
+
+class CameraSpatialGizmo  : public SpatialGizmoTool {
+
+	OBJ_TYPE(CameraSpatialGizmo,SpatialGizmoTool);
+
+	Camera* camera;
+
+public:
+
+
+	virtual String get_handle_name(int p_idx) const;
+	virtual Variant get_handle_value(int p_idx) const;
+	virtual void set_handle(int p_idx,Camera *p_camera, const Point2& p_point);
+	virtual void commit_handle(int p_idx,const Variant& p_restore,bool p_cancel=false);
+
+	void redraw();
+	CameraSpatialGizmo(Camera* p_camera=NULL);
+
+};
+
+
+
+class MeshInstanceSpatialGizmo  : public SpatialGizmoTool {
+
+	OBJ_TYPE(MeshInstanceSpatialGizmo,SpatialGizmoTool);
+
+	MeshInstance* mesh;
+
+public:
+
+	void redraw();
+	MeshInstanceSpatialGizmo(MeshInstance* p_mesh=NULL);
+
+};
+
+class Position3DSpatialGizmo  : public SpatialGizmoTool {
+
+	OBJ_TYPE(Position3DSpatialGizmo,SpatialGizmoTool);
+
+	Position3D* p3d;
+
+public:
+
+	void redraw();
+	Position3DSpatialGizmo(Position3D* p_p3d=NULL);
+
+};
+
+class SkeletonSpatialGizmo  : public SpatialGizmoTool {
+
+	OBJ_TYPE(SkeletonSpatialGizmo,SpatialGizmoTool);
+
+	Skeleton* skel;
+
+public:
+
+	void redraw();
+	SkeletonSpatialGizmo(Skeleton* p_skel=NULL);
+
+};
+
+
+
+
+class SpatialPlayerSpatialGizmo  : public SpatialGizmoTool {
+
+	OBJ_TYPE(SpatialPlayerSpatialGizmo,SpatialGizmoTool);
+
+	SpatialPlayer* splayer;
+
+public:
+
+	void redraw();
+	SpatialPlayerSpatialGizmo(SpatialPlayer* p_splayer=NULL);
+
+};
+
+
+
+class TestCubeSpatialGizmo  : public SpatialGizmoTool {
+
+	OBJ_TYPE(TestCubeSpatialGizmo,SpatialGizmoTool);
+
+	TestCube* tc;
+
+public:
+	void redraw();
+	TestCubeSpatialGizmo(TestCube* p_tc=NULL);
+
+};
+
+
+class RoomSpatialGizmo  : public SpatialGizmoTool {
+
+	OBJ_TYPE(RoomSpatialGizmo,SpatialGizmoTool);
+
+
+	struct _EdgeKey {
+
+		Vector3 from;
+		Vector3 to;
+
+		bool operator<(const _EdgeKey& p_with) const { return from==p_with.from ? to < p_with.to : from < p_with.from; }
+	};
+
+
+
+	Room* room;
+
+public:
+
+	void redraw();
+	RoomSpatialGizmo(Room* p_room=NULL);
+
+};
+
+
+class PortalSpatialGizmo  : public SpatialGizmoTool {
+
+	OBJ_TYPE(PortalSpatialGizmo,SpatialGizmoTool);
+
+	Portal* portal;
+
+public:
+
+	void redraw();
+	PortalSpatialGizmo(Portal* p_portal=NULL);
+
+};
+
+
+class VisibilityNotifierGizmo  : public SpatialGizmoTool {
+
+	OBJ_TYPE(VisibilityNotifierGizmo ,SpatialGizmoTool);
+
+
+	VisibilityNotifier* notifier;
+
+public:
+
+	virtual String get_handle_name(int p_idx) const;
+	virtual Variant get_handle_value(int p_idx) const;
+	virtual void set_handle(int p_idx,Camera *p_camera, const Point2& p_point);
+	virtual void commit_handle(int p_idx,const Variant& p_restore,bool p_cancel=false);
+
+	void redraw();
+	VisibilityNotifierGizmo(VisibilityNotifier* p_notifier=NULL);
+
+};
+
+
+
+class CollisionShapeSpatialGizmo  : public SpatialGizmoTool {
+
+	OBJ_TYPE(CollisionShapeSpatialGizmo,SpatialGizmoTool);
+
+	CollisionShape* cs;
+
+public:
+	virtual String get_handle_name(int p_idx) const;
+	virtual Variant get_handle_value(int p_idx) const;
+	virtual void set_handle(int p_idx,Camera *p_camera, const Point2& p_point);
+	virtual void commit_handle(int p_idx,const Variant& p_restore,bool p_cancel=false);
+	void redraw();
+	CollisionShapeSpatialGizmo(CollisionShape* p_cs=NULL);
+
+};
+
+
+class CollisionPolygonSpatialGizmo  : public SpatialGizmoTool {
+
+	OBJ_TYPE(CollisionPolygonSpatialGizmo,SpatialGizmoTool);
+
+	CollisionPolygon* polygon;
+
+public:
+
+	void redraw();
+	CollisionPolygonSpatialGizmo(CollisionPolygon* p_polygon=NULL);
+
+};
+
+
+class RayCastSpatialGizmo  : public SpatialGizmoTool {
+
+	OBJ_TYPE(RayCastSpatialGizmo,SpatialGizmoTool);
+
+	RayCast* raycast;
+
+public:
+
+	void redraw();
+	RayCastSpatialGizmo(RayCast* p_raycast=NULL);
+
+};
+
+
+
+class VehicleWheelSpatialGizmo  : public SpatialGizmoTool {
+
+	OBJ_TYPE(VehicleWheelSpatialGizmo,SpatialGizmoTool);
+
+	VehicleWheel* car_wheel;
+
+public:
+
+	void redraw();
+	VehicleWheelSpatialGizmo(VehicleWheel* p_car_wheel=NULL);
+
+};
+
+
+class NavigationMeshSpatialGizmo  : public SpatialGizmoTool {
+
+	OBJ_TYPE(NavigationMeshSpatialGizmo,SpatialGizmoTool);
+
+
+	struct _EdgeKey {
+
+		Vector3 from;
+		Vector3 to;
+
+		bool operator<(const _EdgeKey& p_with) const { return from==p_with.from ? to < p_with.to : from < p_with.from; }
+	};
+
+
+
+	NavigationMeshInstance* navmesh;
+
+public:
+
+	void redraw();
+	NavigationMeshSpatialGizmo(NavigationMeshInstance* p_navmesh=NULL);
+
+};
+
+
+class PinJointSpatialGizmo  : public SpatialGizmoTool {
+
+	OBJ_TYPE(PinJointSpatialGizmo,SpatialGizmoTool);
+
+	PinJoint* p3d;
+
+public:
+
+	void redraw();
+	PinJointSpatialGizmo(PinJoint* p_p3d=NULL);
+
+};
+
+
+class HingeJointSpatialGizmo  : public SpatialGizmoTool {
+
+	OBJ_TYPE(HingeJointSpatialGizmo,SpatialGizmoTool);
+
+	HingeJoint* p3d;
+
+public:
+
+	void redraw();
+	HingeJointSpatialGizmo(HingeJoint* p_p3d=NULL);
+
+};
+
+class SliderJointSpatialGizmo  : public SpatialGizmoTool {
+
+	OBJ_TYPE(SliderJointSpatialGizmo,SpatialGizmoTool);
+
+	SliderJoint* p3d;
+
+public:
+
+	void redraw();
+	SliderJointSpatialGizmo(SliderJoint* p_p3d=NULL);
+
+};
+
+class ConeTwistJointSpatialGizmo  : public SpatialGizmoTool {
+
+	OBJ_TYPE(ConeTwistJointSpatialGizmo,SpatialGizmoTool);
+
+	ConeTwistJoint* p3d;
+
+public:
+
+	void redraw();
+	ConeTwistJointSpatialGizmo(ConeTwistJoint* p_p3d=NULL);
+
+};
+
+
+class Generic6DOFJointSpatialGizmo  : public SpatialGizmoTool {
+
+	OBJ_TYPE(Generic6DOFJointSpatialGizmo,SpatialGizmoTool);
+
+	Generic6DOFJoint* p3d;
+
+public:
+
+	void redraw();
+	Generic6DOFJointSpatialGizmo(Generic6DOFJoint* p_p3d=NULL);
+
+};
+
+
+class SpatialEditorGizmos  {
+public:
+
+	Ref<FixedMaterial> create_line_material(const Color& p_base_color);
+	Ref<FixedMaterial> create_solid_material(const Color& p_base_color);
+	Ref<FixedMaterial> handle2_material;
+	Ref<FixedMaterial> handle_material;
+	Ref<FixedMaterial> light_material;
+	Ref<FixedMaterial> light_material_omni_icon;
+	Ref<FixedMaterial> light_material_directional_icon;
+	Ref<FixedMaterial> camera_material;
+	Ref<FixedMaterial> skeleton_material;
+	Ref<FixedMaterial> room_material;
+	Ref<FixedMaterial> portal_material;
+	Ref<FixedMaterial> raycast_material;
+	Ref<FixedMaterial> visibility_notifier_material;
+	Ref<FixedMaterial> car_wheel_material;
+	Ref<FixedMaterial> joint_material;
+
+	Ref<FixedMaterial> navmesh_edge_material;
+	Ref<FixedMaterial> navmesh_solid_material;
+	Ref<FixedMaterial> navmesh_edge_material_disabled;
+	Ref<FixedMaterial> navmesh_solid_material_disabled;
+
+
+	Ref<FixedMaterial> sample_player_icon;
+	Ref<FixedMaterial> stream_player_icon;
+	Ref<FixedMaterial> visibility_notifier_icon;
+
+	Ref<FixedMaterial> shape_material;
+	Ref<Texture> handle_t;
+
+	Ref<Mesh> pos3d_mesh;
+	static SpatialEditorGizmos *singleton;
+
+	Ref<TriangleMesh> test_cube_tm;
+
+
+	Ref<SpatialEditorGizmo> get_gizmo(Spatial *p_spatial);
+
+	SpatialEditorGizmos();
+};
+
+#endif // SPATIAL_EDITOR_GIZMOS_H
+