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

-begin of export work, not done yet

Browse Source 
-fixes to make scenes exported from godot 2.x work
This commit is contained in:
Juan Linietsky
2017-02-12 22:51:16 -03:00
parent 9cdd364fc0
commit d7fd86d51a
9 changed files with 367 additions and 849 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tools/editor/multi_node_edit.cpp
View File

@@ -38,8 +38,8 @@ bool MultiNodeEdit::_set(const StringName& p_name, const Variant& p_value){
String name = p_name;
if (name=="scripts/script") { // script/script set is intercepted at object level (check Variant Object::get() ) ,so use a different name
name="script/script";
if (name=="scripts") { // script set is intercepted at object level (check Variant Object::get() ) ,so use a different name
name="script";
}
UndoRedo *ur=EditorNode::get_singleton()->get_undo_redo();
@@ -80,8 +80,8 @@ bool MultiNodeEdit::_get(const StringName& p_name,Variant &r_ret) const {
return false;
String name=p_name;
if (name=="scripts/script") { // script/script set is intercepted at object level (check Variant Object::get() ) ,so use a different name
name="script/script";
if (name=="scripts") { // script set is intercepted at object level (check Variant Object::get() ) ,so use a different name
name="script";
}
for (const List<NodePath>::Element *E=nodes.front();E;E=E->next()) {
@@ -129,7 +129,7 @@ void MultiNodeEdit::_get_property_list( List<PropertyInfo> *p_list) const{
for(List<PropertyInfo>::Element *F=plist.front();F;F=F->next()) {
if (F->get().name=="script/script")
if (F->get().name=="script")
continue; //added later manually, since this is intercepted before being set (check Variant Object::get() )
if (!usage.has(F->get().name)) {
PLData pld;
@@ -152,7 +152,7 @@ void MultiNodeEdit::_get_property_list( List<PropertyInfo> *p_list) const{
}
}
p_list->push_back(PropertyInfo(Variant::OBJECT,"scripts/script",PROPERTY_HINT_RESOURCE_TYPE,"Script"));
p_list->push_back(PropertyInfo(Variant::OBJECT,"scripts",PROPERTY_HINT_RESOURCE_TYPE,"Script"));
}