Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Small fixes to redundand code, copy paste bugs

Browse source
This commit is contained in:
qarmin 2019-10-14 11:40:55 +02:00
parent 1fed266bf5
commit 616ab4fac2
13 changed files with 16 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
editor/import/editor_scene_importer_gltf.cpp
View file

@ -1973,7 +1973,7 @@ Error EditorSceneImporterGLTF::_reparent_to_fake_joint(GLTFState &state, GLTFSke
state.nodes.push_back(fake_joint);
// We better not be a joint, or we messed up in our logic
if (node->joint == true)
if (node->joint)
return FAILED;
fake_joint->translation = node->translation;

4
editor/plugins/canvas_item_editor_plugin.cpp
View file

@ -1197,7 +1197,7 @@ bool CanvasItemEditor::_gui_input_zoom_or_pan(const Ref<InputEvent> &p_event, bo
//Pan the viewport
panning = true;
}
} else if (panning) {
} else {
if (!k->is_pressed()) {
// Stop panning the viewport (for any mouse button press)
panning = false;
@ -4894,7 +4894,7 @@ void CanvasItemEditor::set_state(const Dictionary &p_state) {
if (state.has("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")) {

2
editor/project_settings_editor.cpp
View file

@ -1109,6 +1109,8 @@ void ProjectSettingsEditor::drop_data_fw(const Point2 &p_point, const Variant &p
TreeItem *selected = input_editor->get_selected();
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();
String selected_name = "input/" + selected->get_text(0);