godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-11-22 15:06:45 +00:00
Code Releases Wiki Activity

-New reparent option "keep global transform" on reparent dialog. It is enabled by default. Closes #2284

Browse Source
This commit is contained in:
Juan Linietsky
2016-01-02 11:57:47 -03:00
parent d069c44a7f
commit 84f96eb523
4 changed files with 52 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/editor/reparent_dialog.cpp
View File

@@ -62,7 +62,7 @@ void ReparentDialog::_reparent() {
if (tree->get_selected()) {
emit_signal("reparent",tree->get_selected()->get_path(),node_only->is_pressed());
emit_signal("reparent",tree->get_selected()->get_path(),keep_transform->is_pressed());
hide();
}
}
@@ -78,7 +78,7 @@ void ReparentDialog::_bind_methods() {
ObjectTypeDB::bind_method("_reparent",&ReparentDialog::_reparent);
ObjectTypeDB::bind_method("_cancel",&ReparentDialog::_cancel);
ADD_SIGNAL( MethodInfo("reparent",PropertyInfo(Variant::NODE_PATH,"path"),PropertyInfo(Variant::BOOL,"only_node")));
ADD_SIGNAL( MethodInfo("reparent",PropertyInfo(Variant::NODE_PATH,"path"),PropertyInfo(Variant::BOOL,"keep_global_xform")));
}
@@ -101,15 +101,18 @@ ReparentDialog::ReparentDialog() {
//label->set_pos( Point2( 15,8) );
//label->set_text("Reparent Location (Select new Parent):");
node_only = memnew( CheckButton );
add_child(node_only);
node_only->hide();
keep_transform = memnew( CheckBox );
keep_transform->set_text("Keep Global Transform");
keep_transform->set_pressed(true);
vbc->add_child(keep_transform);
//vbc->add_margin_child("Options:",node_only);;
//cancel->connect("pressed", this,"_cancel");
get_ok()->set_text("Reparent");
}