Small fixes to redundand code, copy paste bugs
This commit is contained in:
parent
1fed266bf5
commit
616ab4fac2
|
@ -136,6 +136,8 @@ void PHashTranslation::generate(const Ref<Translation> &p_from) {
|
||||||
bucket_table_size += 2 + b.size() * 4;
|
bucket_table_size += 2 + b.size() * 4;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ERR_FAIL_COND(bucket_table_size == 0);
|
||||||
|
|
||||||
hash_table.resize(size);
|
hash_table.resize(size);
|
||||||
bucket_table.resize(bucket_table_size);
|
bucket_table.resize(bucket_table_size);
|
||||||
|
|
||||||
|
|
|
@ -1973,7 +1973,7 @@ Error EditorSceneImporterGLTF::_reparent_to_fake_joint(GLTFState &state, GLTFSke
|
||||||
state.nodes.push_back(fake_joint);
|
state.nodes.push_back(fake_joint);
|
||||||
|
|
||||||
// We better not be a joint, or we messed up in our logic
|
// We better not be a joint, or we messed up in our logic
|
||||||
if (node->joint == true)
|
if (node->joint)
|
||||||
return FAILED;
|
return FAILED;
|
||||||
|
|
||||||
fake_joint->translation = node->translation;
|
fake_joint->translation = node->translation;
|
||||||
|
|
|
@ -1197,7 +1197,7 @@ bool CanvasItemEditor::_gui_input_zoom_or_pan(const Ref<InputEvent> &p_event, bo
|
||||||
//Pan the viewport
|
//Pan the viewport
|
||||||
panning = true;
|
panning = true;
|
||||||
}
|
}
|
||||||
} else if (panning) {
|
} else {
|
||||||
if (!k->is_pressed()) {
|
if (!k->is_pressed()) {
|
||||||
// Stop panning the viewport (for any mouse button press)
|
// Stop panning the viewport (for any mouse button press)
|
||||||
panning = false;
|
panning = false;
|
||||||
|
@ -4894,7 +4894,7 @@ void CanvasItemEditor::set_state(const Dictionary &p_state) {
|
||||||
|
|
||||||
if (state.has("grid_snap_active")) {
|
if (state.has("grid_snap_active")) {
|
||||||
grid_snap_active = state["grid_snap_active"];
|
grid_snap_active = state["grid_snap_active"];
|
||||||
grid_snap_button->set_pressed(smart_snap_active);
|
grid_snap_button->set_pressed(grid_snap_active);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (state.has("snap_node_parent")) {
|
if (state.has("snap_node_parent")) {
|
||||||
|
|
|
@ -1109,6 +1109,8 @@ void ProjectSettingsEditor::drop_data_fw(const Point2 &p_point, const Variant &p
|
||||||
|
|
||||||
TreeItem *selected = input_editor->get_selected();
|
TreeItem *selected = input_editor->get_selected();
|
||||||
TreeItem *item = input_editor->get_item_at_position(p_point);
|
TreeItem *item = input_editor->get_item_at_position(p_point);
|
||||||
|
if (!item)
|
||||||
|
return;
|
||||||
TreeItem *target = item->get_parent() == input_editor->get_root() ? item : item->get_parent();
|
TreeItem *target = item->get_parent() == input_editor->get_root() ? item : item->get_parent();
|
||||||
|
|
||||||
String selected_name = "input/" + selected->get_text(0);
|
String selected_name = "input/" + selected->get_text(0);
|
||||||
|
|
|
@ -1856,9 +1856,7 @@ bool Main::start() {
|
||||||
// Hide console window if requested (Windows-only).
|
// Hide console window if requested (Windows-only).
|
||||||
bool hide_console = EditorSettings::get_singleton()->get_setting("interface/editor/hide_console_window");
|
bool hide_console = EditorSettings::get_singleton()->get_setting("interface/editor/hide_console_window");
|
||||||
OS::get_singleton()->set_console_visible(!hide_console);
|
OS::get_singleton()->set_console_visible(!hide_console);
|
||||||
}
|
|
||||||
|
|
||||||
if (project_manager || editor) {
|
|
||||||
// Load SSL Certificates from Editor Settings (or builtin)
|
// Load SSL Certificates from Editor Settings (or builtin)
|
||||||
Crypto::load_default_certificates(EditorSettings::get_singleton()->get_setting("network/ssl/editor_ssl_certificates").operator String());
|
Crypto::load_default_certificates(EditorSettings::get_singleton()->get_setting("network/ssl/editor_ssl_certificates").operator String());
|
||||||
}
|
}
|
||||||
|
|
|
@ -2232,9 +2232,7 @@ void GDScriptParser::_parse_pattern_block(BlockNode *p_block, Vector<PatternBran
|
||||||
break; // go back a level
|
break; // go back a level
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pending_newline != -1) {
|
pending_newline = -1;
|
||||||
pending_newline = -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
PatternBranchNode *branch = alloc_node<PatternBranchNode>();
|
PatternBranchNode *branch = alloc_node<PatternBranchNode>();
|
||||||
branch->body = alloc_node<BlockNode>();
|
branch->body = alloc_node<BlockNode>();
|
||||||
|
|
|
@ -496,7 +496,7 @@ struct TextDocumentSyncOptions {
|
||||||
dict["willSave"] = willSave;
|
dict["willSave"] = willSave;
|
||||||
dict["openClose"] = openClose;
|
dict["openClose"] = openClose;
|
||||||
dict["change"] = change;
|
dict["change"] = change;
|
||||||
dict["change"] = save.to_json();
|
dict["save"] = save.to_json();
|
||||||
return dict;
|
return dict;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
|
@ -228,7 +228,7 @@ class VisualScriptEditor : public ScriptEditorBase {
|
||||||
void _update_node_size(int p_id);
|
void _update_node_size(int p_id);
|
||||||
void _port_name_focus_out(const Node *p_name_box, int p_id, int p_port, bool is_input);
|
void _port_name_focus_out(const Node *p_name_box, int p_id, int p_port, bool is_input);
|
||||||
|
|
||||||
Vector2 _get_available_pos(bool centered = true, Vector2 pos = Vector2()) const;
|
Vector2 _get_available_pos(bool centered = true, Vector2 ofs = Vector2()) const;
|
||||||
StringName _get_function_of_node(int p_id) const;
|
StringName _get_function_of_node(int p_id) const;
|
||||||
|
|
||||||
void _move_nodes_with_rescan(const StringName &p_func_from, const StringName &p_func_to, int p_id);
|
void _move_nodes_with_rescan(const StringName &p_func_from, const StringName &p_func_to, int p_id);
|
||||||
|
|
|
@ -45,7 +45,7 @@ class VisualScriptPropertySelector : public ConfirmationDialog {
|
||||||
|
|
||||||
void create_visualscript_item(const String &name, TreeItem *const root, const String &search_input, const String &text);
|
void create_visualscript_item(const String &name, TreeItem *const root, const String &search_input, const String &text);
|
||||||
|
|
||||||
void get_visual_node_names(const String &root_filter, const Set<String> &filter, bool &found, TreeItem *const root, LineEdit *const search_box);
|
void get_visual_node_names(const String &root_filter, const Set<String> &p_modifiers, bool &found, TreeItem *const root, LineEdit *const search_box);
|
||||||
|
|
||||||
void _sbox_input(const Ref<InputEvent> &p_ie);
|
void _sbox_input(const Ref<InputEvent> &p_ie);
|
||||||
|
|
||||||
|
|
|
@ -577,9 +577,8 @@ void Sprite3D::set_frame(int p_frame) {
|
||||||
|
|
||||||
ERR_FAIL_INDEX(p_frame, int64_t(vframes) * hframes);
|
ERR_FAIL_INDEX(p_frame, int64_t(vframes) * hframes);
|
||||||
|
|
||||||
if (frame != p_frame)
|
frame = p_frame;
|
||||||
|
|
||||||
frame = p_frame;
|
|
||||||
_queue_update();
|
_queue_update();
|
||||||
|
|
||||||
_change_notify("frame");
|
_change_notify("frame");
|
||||||
|
|
|
@ -5915,7 +5915,7 @@ void TextEdit::unfold_line(int p_line) {
|
||||||
|
|
||||||
if (!is_folded(p_line) && !is_line_hidden(p_line))
|
if (!is_folded(p_line) && !is_line_hidden(p_line))
|
||||||
return;
|
return;
|
||||||
int fold_start = p_line;
|
int fold_start;
|
||||||
for (fold_start = p_line; fold_start > 0; fold_start--) {
|
for (fold_start = p_line; fold_start > 0; fold_start--) {
|
||||||
if (is_folded(fold_start))
|
if (is_folded(fold_start))
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -70,9 +70,8 @@ float SceneTreeTimer::get_time_left() const {
|
||||||
}
|
}
|
||||||
|
|
||||||
void SceneTreeTimer::set_pause_mode_process(bool p_pause_mode_process) {
|
void SceneTreeTimer::set_pause_mode_process(bool p_pause_mode_process) {
|
||||||
if (process_pause != p_pause_mode_process) {
|
|
||||||
process_pause = p_pause_mode_process;
|
process_pause = p_pause_mode_process;
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool SceneTreeTimer::is_pause_mode_process() {
|
bool SceneTreeTimer::is_pause_mode_process() {
|
||||||
|
|
|
@ -534,7 +534,7 @@ void BitMap::grow_mask(int p_pixels, const Rect2 &p_rect) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool bit_value = (p_pixels > 0) ? true : false;
|
bool bit_value = p_pixels > 0;
|
||||||
p_pixels = Math::abs(p_pixels);
|
p_pixels = Math::abs(p_pixels);
|
||||||
|
|
||||||
Rect2i r = Rect2i(0, 0, width, height).clip(p_rect);
|
Rect2i r = Rect2i(0, 0, width, height).clip(p_rect);
|
||||||
|
|
Loading…
Reference in New Issue