asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Signals: Make callbacks non-const, callable_mp can't handle it

Browse source
This commit is contained in:
Rémi Verschelde 2020-02-21 17:44:59 +01:00
parent 4b6c0560da
commit 65429f11a6
6 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
editor/animation_track_editor.cpp
View file

@ -5707,7 +5707,7 @@ float AnimationTrackEditor::snap_time(float p_value, bool p_relative) {
return p_value; return p_value;
} }
void AnimationTrackEditor::_show_imported_anim_warning() const { void AnimationTrackEditor::_show_imported_anim_warning() {
// It looks terrible on a single line but the TTR extractor doesn't support line breaks yet. // It looks terrible on a single line but the TTR extractor doesn't support line breaks yet.
EditorNode::get_singleton()->show_warning(TTR("This animation belongs to an imported scene, so changes to imported tracks will not be saved.\n\nTo enable the ability to add custom tracks, navigate to the scene's import settings and set\n\"Animation > Storage\" to \"Files\", enable \"Animation > Keep Custom Tracks\", then re-import.\nAlternatively, use an import preset that imports animations to separate files."), EditorNode::get_singleton()->show_warning(TTR("This animation belongs to an imported scene, so changes to imported tracks will not be saved.\n\nTo enable the ability to add custom tracks, navigate to the scene's import settings and set\n\"Animation > Storage\" to \"Files\", enable \"Animation > Keep Custom Tracks\", then re-import.\nAlternatively, use an import preset that imports animations to separate files."),

2
editor/animation_track_editor.h
View file

@ -314,7 +314,7 @@ class AnimationTrackEditor : public VBoxContainer {
OptionButton *snap_mode; OptionButton *snap_mode;
Button *imported_anim_warning; Button *imported_anim_warning;
void _show_imported_anim_warning() const; void _show_imported_anim_warning();
void _snap_mode_changed(int p_mode); void _snap_mode_changed(int p_mode);
Vector<AnimationTrackEdit *> track_edits; Vector<AnimationTrackEdit *> track_edits;

2
editor/filesystem_dock.cpp
View file

@ -1775,7 +1775,7 @@ void FileSystemDock::_file_option(int p_option, const Vector<String> &p_selected
} }
} }
void FileSystemDock::_resource_created() const { void FileSystemDock::_resource_created() {
Object *c = new_resource_dialog->instance_selected(); Object *c = new_resource_dialog->instance_selected();
ERR_FAIL_COND(!c); ERR_FAIL_COND(!c);

2
editor/filesystem_dock.h
View file

@ -215,7 +215,7 @@ private:
void _files_moved(String p_old_file, String p_new_file); void _files_moved(String p_old_file, String p_new_file);
void _folder_moved(String p_old_folder, String p_new_folder); void _folder_moved(String p_old_folder, String p_new_folder);
void _resource_created() const; void _resource_created();
void _make_dir_confirm(); void _make_dir_confirm();
void _make_scene_confirm(); void _make_scene_confirm();
void _rename_operation_confirm(); void _rename_operation_confirm();

6
editor/inspector_dock.cpp
View file

@ -260,7 +260,7 @@ void InspectorDock::_prepare_history() {
} }
} }
void InspectorDock::_select_history(int p_idx) const { void InspectorDock::_select_history(int p_idx) {
//push it to the top, it is not correct, but it's more useful //push it to the top, it is not correct, but it's more useful
ObjectID id = EditorNode::get_singleton()->get_editor_history()->get_history_obj(p_idx); ObjectID id = EditorNode::get_singleton()->get_editor_history()->get_history_obj(p_idx);
Object *obj = ObjectDB::get_instance(id); Object *obj = ObjectDB::get_instance(id);
@ -269,7 +269,7 @@ void InspectorDock::_select_history(int p_idx) const {
editor->push_item(obj); editor->push_item(obj);
} }
void InspectorDock::_resource_created() const { void InspectorDock::_resource_created() {
Object *c = new_resource_dialog->instance_selected(); Object *c = new_resource_dialog->instance_selected();
ERR_FAIL_COND(!c); ERR_FAIL_COND(!c);
@ -280,7 +280,7 @@ void InspectorDock::_resource_created() const {
editor->push_item(c); editor->push_item(c);
} }
void InspectorDock::_resource_selected(const RES &p_res, const String &p_property) const { void InspectorDock::_resource_selected(const RES &p_res, const String &p_property) {
if (p_res.is_null()) if (p_res.is_null())
return; return;

6
editor/inspector_dock.h
View file

@ -104,13 +104,13 @@ class InspectorDock : public VBoxContainer {
void _paste_resource() const; void _paste_resource() const;
void _warning_pressed(); void _warning_pressed();
void _resource_created() const; void _resource_created();
void _resource_selected(const RES &p_res, const String &p_property = "") const; void _resource_selected(const RES &p_res, const String &p_property = "");
void _edit_forward(); void _edit_forward();
void _edit_back(); void _edit_back();
void _menu_collapseall(); void _menu_collapseall();
void _menu_expandall(); void _menu_expandall();
void _select_history(int p_idx) const; void _select_history(int p_idx);
void _prepare_history(); void _prepare_history();
void _property_keyed(const String &p_keyed, const Variant &p_value, bool p_advance); void _property_keyed(const String &p_keyed, const Variant &p_value, bool p_advance);