|
@@ -831,7 +831,7 @@ bool EditorNode::_find_and_save_edited_subresources(Object *obj,Map<RES,bool>& p
|
|
case Variant::DICTIONARY: {
|
|
case Variant::DICTIONARY: {
|
|
|
|
|
|
|
|
|
|
- Dictionary d=obj->get(E->get().name);;
|
|
|
|
|
|
+ Dictionary d=obj->get(E->get().name);
|
|
List<Variant> keys;
|
|
List<Variant> keys;
|
|
d.get_key_list(&keys);
|
|
d.get_key_list(&keys);
|
|
for(List<Variant>::Element *E=keys.front();E;E=E->next()) {
|
|
for(List<Variant>::Element *E=keys.front();E;E=E->next()) {
|
|
@@ -917,7 +917,7 @@ void EditorNode::_save_scene_with_preview(String p_file) {
|
|
save.step(TTR("Creating Thumbnail"),3);
|
|
save.step(TTR("Creating Thumbnail"),3);
|
|
#if 0
|
|
#if 0
|
|
Image img = VS::get_singleton()->viewport_texture(scree_capture(viewport);
|
|
Image img = VS::get_singleton()->viewport_texture(scree_capture(viewport);
|
|
- int preview_size = EditorSettings::get_singleton()->get("filesystem/file_dialog/thumbnail_size");;
|
|
|
|
|
|
+ int preview_size = EditorSettings::get_singleton()->get("filesystem/file_dialog/thumbnail_size");
|
|
preview_size*=EDSCALE;
|
|
preview_size*=EDSCALE;
|
|
int width,height;
|
|
int width,height;
|
|
if (img.get_width() > preview_size && img.get_width() >= img.get_height()) {
|
|
if (img.get_width() > preview_size && img.get_width() >= img.get_height()) {
|
|
@@ -1056,7 +1056,7 @@ void EditorNode::_import_action(const String& p_action) {
|
|
//accept->get_cancel()->hide();
|
|
//accept->get_cancel()->hide();
|
|
accept->get_ok()->set_text("Ugh");
|
|
accept->get_ok()->set_text("Ugh");
|
|
accept->set_text("Error importing scene.");
|
|
accept->set_text("Error importing scene.");
|
|
- accept->popup_centered(Size2(300,70));;
|
|
|
|
|
|
+ accept->popup_centered(Size2(300,70));
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1072,7 +1072,7 @@ void EditorNode::_import_action(const String& p_action) {
|
|
//accept->get_cancel()->hide();
|
|
//accept->get_cancel()->hide();
|
|
accept->get_ok()->set_text("Ugh");
|
|
accept->get_ok()->set_text("Ugh");
|
|
accept->set_text("Error load scene to update.");
|
|
accept->set_text("Error load scene to update.");
|
|
- accept->popup_centered(Size2(300,70));;
|
|
|
|
|
|
+ accept->popup_centered(Size2(300,70));
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1113,7 +1113,7 @@ void EditorNode::_import(const String &p_file) {
|
|
//accept->get_cancel()->hide();
|
|
//accept->get_cancel()->hide();
|
|
accept->get_ok()->set_text("Ugh");
|
|
accept->get_ok()->set_text("Ugh");
|
|
accept->set_text("Error importing scene.");
|
|
accept->set_text("Error importing scene.");
|
|
- accept->popup_centered(Size2(300,70));;
|
|
|
|
|
|
+ accept->popup_centered(Size2(300,70));
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -2255,7 +2255,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
|
|
//confirmation->get_cancel()->hide();
|
|
//confirmation->get_cancel()->hide();
|
|
accept->get_ok()->set_text("I see..");
|
|
accept->get_ok()->set_text("I see..");
|
|
accept->set_text("This operation can't be done without a tree root.");
|
|
accept->set_text("This operation can't be done without a tree root.");
|
|
- accept->popup_centered(Size2(300,70));;
|
|
|
|
|
|
+ accept->popup_centered(Size2(300,70));
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -2277,7 +2277,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
|
|
//confirmation->get_cancel()->hide();
|
|
//confirmation->get_cancel()->hide();
|
|
accept->get_ok()->set_text("I see..");
|
|
accept->get_ok()->set_text("I see..");
|
|
accept->set_text("Please save the scene first.");
|
|
accept->set_text("Please save the scene first.");
|
|
- accept->popup_centered(Size2(300,70));;
|
|
|
|
|
|
+ accept->popup_centered(Size2(300,70));
|
|
break;
|
|
break;
|
|
|
|
|
|
}
|
|
}
|
|
@@ -2292,7 +2292,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
|
|
Ref<EditorExporter> exporter = export_db->get_exporter(target);
|
|
Ref<EditorExporter> exporter = export_db->get_exporter(target);
|
|
if (exporter.is_null()) {
|
|
if (exporter.is_null()) {
|
|
accept->set_text("No exporter for platform '"+target+"' yet.");
|
|
accept->set_text("No exporter for platform '"+target+"' yet.");
|
|
- accept->popup_centered(Size2(300,70));;
|
|
|
|
|
|
+ accept->popup_centered(Size2(300,70));
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -2475,7 +2475,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
|
|
//accept->get_cancel()->hide();
|
|
//accept->get_cancel()->hide();
|
|
accept->get_ok()->set_text("I see..");
|
|
accept->get_ok()->set_text("I see..");
|
|
accept->set_text("This operation can't be done without a selected node.");
|
|
accept->set_text("This operation can't be done without a selected node.");
|
|
- accept->popup_centered(Size2(300,70));;
|
|
|
|
|
|
+ accept->popup_centered(Size2(300,70));
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -2487,7 +2487,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
|
|
//confirmation->get_cancel()->hide();
|
|
//confirmation->get_cancel()->hide();
|
|
accept->get_ok()->set_text("I see..");
|
|
accept->get_ok()->set_text("I see..");
|
|
accept->set_text("This operation can't be done without a selected node.");
|
|
accept->set_text("This operation can't be done without a selected node.");
|
|
- accept->popup_centered(Size2(300,70));;
|
|
|
|
|
|
+ accept->popup_centered(Size2(300,70));
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -2499,7 +2499,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
|
|
//accept->get_cancel()->hide();
|
|
//accept->get_cancel()->hide();
|
|
accept->get_ok()->set_text("Ugh");
|
|
accept->get_ok()->set_text("Ugh");
|
|
accept->set_text("Error loading scene from "+external_file);
|
|
accept->set_text("Error loading scene from "+external_file);
|
|
- accept->popup_centered(Size2(300,70));;
|
|
|
|
|
|
+ accept->popup_centered(Size2(300,70));
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -2594,20 +2594,20 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
|
|
} break;
|
|
} break;
|
|
case OBJECT_COPY_PARAMS: {
|
|
case OBJECT_COPY_PARAMS: {
|
|
|
|
|
|
- editor_data.apply_changes_in_editors();;
|
|
|
|
|
|
+ editor_data.apply_changes_in_editors();
|
|
if (current)
|
|
if (current)
|
|
editor_data.copy_object_params(current);
|
|
editor_data.copy_object_params(current);
|
|
} break;
|
|
} break;
|
|
case OBJECT_PASTE_PARAMS: {
|
|
case OBJECT_PASTE_PARAMS: {
|
|
|
|
|
|
- editor_data.apply_changes_in_editors();;
|
|
|
|
|
|
+ editor_data.apply_changes_in_editors();
|
|
if (current)
|
|
if (current)
|
|
editor_data.paste_object_params(current);
|
|
editor_data.paste_object_params(current);
|
|
editor_data.get_undo_redo().clear_history();
|
|
editor_data.get_undo_redo().clear_history();
|
|
} break;
|
|
} break;
|
|
case OBJECT_UNIQUE_RESOURCES: {
|
|
case OBJECT_UNIQUE_RESOURCES: {
|
|
|
|
|
|
- editor_data.apply_changes_in_editors();;
|
|
|
|
|
|
+ editor_data.apply_changes_in_editors();
|
|
if (current) {
|
|
if (current) {
|
|
List<PropertyInfo> props;
|
|
List<PropertyInfo> props;
|
|
current->get_property_list(&props);
|
|
current->get_property_list(&props);
|
|
@@ -2915,7 +2915,7 @@ void EditorNode::_menu_option_confirm(int p_option,bool p_confirmed) {
|
|
//accept->get_cancel()->hide();
|
|
//accept->get_cancel()->hide();
|
|
accept->get_ok()->set_text("I see..");
|
|
accept->get_ok()->set_text("I see..");
|
|
accept->set_text("Can't import if edited scene was not saved."); //i dont think this code will ever run
|
|
accept->set_text("Can't import if edited scene was not saved."); //i dont think this code will ever run
|
|
- accept->popup_centered(Size2(300,70));;
|
|
|
|
|
|
+ accept->popup_centered(Size2(300,70));
|
|
break;
|
|
break;
|
|
|
|
|
|
}
|
|
}
|
|
@@ -3382,7 +3382,7 @@ Error EditorNode::save_optimized_copy(const String& p_scene,const String& p_pres
|
|
//accept->"()->hide();
|
|
//accept->"()->hide();
|
|
accept->get_ok()->set_text("I see..");
|
|
accept->get_ok()->set_text("I see..");
|
|
accept->set_text("Optimizer preset not found: "+p_preset);
|
|
accept->set_text("Optimizer preset not found: "+p_preset);
|
|
- accept->popup_centered(Size2(300,70));;
|
|
|
|
|
|
+ accept->popup_centered(Size2(300,70));
|
|
ERR_EXPLAIN("Optimizer preset not found: "+p_preset);
|
|
ERR_EXPLAIN("Optimizer preset not found: "+p_preset);
|
|
ERR_FAIL_V(ERR_INVALID_PARAMETER);
|
|
ERR_FAIL_V(ERR_INVALID_PARAMETER);
|
|
|
|
|
|
@@ -3442,7 +3442,7 @@ Error EditorNode::save_optimized_copy(const String& p_scene,const String& p_pres
|
|
//accept->get_cancel()->hide();
|
|
//accept->get_cancel()->hide();
|
|
accept->get_ok()->set_text("I see..");
|
|
accept->get_ok()->set_text("I see..");
|
|
accept->set_text("Couldn't save scene. Likely dependencies (instances) couldn't be satisfied.");
|
|
accept->set_text("Couldn't save scene. Likely dependencies (instances) couldn't be satisfied.");
|
|
- accept->popup_centered(Size2(300,70));;
|
|
|
|
|
|
+ accept->popup_centered(Size2(300,70));
|
|
return ERR_INVALID_DATA;
|
|
return ERR_INVALID_DATA;
|
|
|
|
|
|
}
|
|
}
|
|
@@ -3453,7 +3453,7 @@ Error EditorNode::save_optimized_copy(const String& p_scene,const String& p_pres
|
|
//accept->"()->hide();
|
|
//accept->"()->hide();
|
|
accept->get_ok()->set_text("I see..");
|
|
accept->get_ok()->set_text("I see..");
|
|
accept->set_text("Error saving optimized scene: "+path);
|
|
accept->set_text("Error saving optimized scene: "+path);
|
|
- accept->popup_centered(Size2(300,70));;
|
|
|
|
|
|
+ accept->popup_centered(Size2(300,70));
|
|
|
|
|
|
ERR_FAIL_COND_V(err,err);
|
|
ERR_FAIL_COND_V(err,err);
|
|
|
|
|
|
@@ -4038,7 +4038,7 @@ void EditorNode::_save_optimized() {
|
|
//accept->"()->hide();
|
|
//accept->"()->hide();
|
|
accept->get_ok()->set_text("I see..");
|
|
accept->get_ok()->set_text("I see..");
|
|
accept->set_text("Error saving optimized scene: "+path);
|
|
accept->set_text("Error saving optimized scene: "+path);
|
|
- accept->popup_centered(Size2(300,70));;
|
|
|
|
|
|
+ accept->popup_centered(Size2(300,70));
|
|
return;
|
|
return;
|
|
|
|
|
|
}
|
|
}
|
|
@@ -5615,7 +5615,7 @@ EditorNode::EditorNode() {
|
|
#if 0
|
|
#if 0
|
|
PanelContainer *top_dark_panel = memnew( PanelContainer );
|
|
PanelContainer *top_dark_panel = memnew( PanelContainer );
|
|
Ref<StyleBoxTexture> top_dark_sb;
|
|
Ref<StyleBoxTexture> top_dark_sb;
|
|
- top_dark_sb.instance();;
|
|
|
|
|
|
+ top_dark_sb.instance();
|
|
top_dark_sb->set_texture(theme->get_icon("PanelTop","EditorIcons"));
|
|
top_dark_sb->set_texture(theme->get_icon("PanelTop","EditorIcons"));
|
|
for(int i=0;i<4;i++) {
|
|
for(int i=0;i<4;i++) {
|
|
top_dark_sb->set_margin_size(Margin(i),3);
|
|
top_dark_sb->set_margin_size(Margin(i),3);
|
|
@@ -5937,7 +5937,7 @@ EditorNode::EditorNode() {
|
|
#if 0
|
|
#if 0
|
|
node_menu = memnew( MenuButton );
|
|
node_menu = memnew( MenuButton );
|
|
node_menu->set_text("Node");
|
|
node_menu->set_text("Node");
|
|
- node_menu->set_pos( Point2( 50,0) );;
|
|
|
|
|
|
+ node_menu->set_pos( Point2( 50,0) );
|
|
menu_panel->add_child( node_menu );
|
|
menu_panel->add_child( node_menu );
|
|
|
|
|
|
p=node_menu->get_popup();
|
|
p=node_menu->get_popup();
|
|
@@ -6455,7 +6455,7 @@ EditorNode::EditorNode() {
|
|
animation_menu->set_focus_mode(Control::FOCUS_NONE);
|
|
animation_menu->set_focus_mode(Control::FOCUS_NONE);
|
|
menu_panel->add_child(animation_menu);
|
|
menu_panel->add_child(animation_menu);
|
|
animation_menu->set_icon(gui_base->get_icon("Animation","EditorIcons"));
|
|
animation_menu->set_icon(gui_base->get_icon("Animation","EditorIcons"));
|
|
- animation_menu->connect("pressed",this,"_animation_visibility_toggle");;
|
|
|
|
|
|
+ animation_menu->connect("pressed",this,"_animation_visibility_toggle");
|
|
*/
|
|
*/
|
|
|
|
|
|
|
|
|