Relintai
/
godot
mirror of https://github.com/Relintai/godot.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3065 from TheHX/pr-array-editor 

Fix array editor NodePath being relative to editor
This commit is contained in:
Rémi Verschelde 2015-12-14 07:39:17 +01:00
parent 7f96f0603e 2e8ed75d8d
commit 55684dbea4
3 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tools/editor/array_property_edit.cpp
View File

@ -209,6 +209,15 @@ void ArrayPropertyEdit::edit(Object* p_obj,const StringName& p_prop,Variant::Typ
}
Node *ArrayPropertyEdit::get_node() {
Object *o = ObjectDB::get_instance(obj);
if (!o)
return NULL;
return o->cast_to<Node>();
}
void ArrayPropertyEdit::_bind_methods() {
ObjectTypeDB::bind_method(_MD("_set_size"),&ArrayPropertyEdit::_set_size);

2
tools/editor/array_property_edit.h
View File

@ -30,6 +30,8 @@ public:
void edit(Object* p_obj, const StringName& p_prop, Variant::Type p_deftype);
Node *get_node();
ArrayPropertyEdit();
};

20
tools/editor/property_editor.cpp
View File

@ -915,15 +915,25 @@ void CustomPropertyEditor::_color_changed(const Color& p_color) {
void CustomPropertyEditor::_node_path_selected(NodePath p_path) {
if (owner && owner->is_type("Node")) {
if (owner) {
Node *node = owner->cast_to<Node>();
Node *tonode=node->get_node(p_path);
if (tonode) {
Node *node=NULL;
p_path=node->get_path_to(tonode);
if (owner->is_type("Node"))
node = owner->cast_to<Node>();
else if (owner->is_type("ArrayPropertyEdit"))
node = owner->cast_to<ArrayPropertyEdit>()->get_node();
if (!node) {
v=p_path;
emit_signal("variant_changed");
return;
}
Node *tonode=node->get_node(p_path);
if (tonode) {
p_path=node->get_path_to(tonode);
}
}
v=p_path;