diff options
| -rw-r--r-- | editor/animation_track_editor.cpp | 7 | ||||
| -rwxr-xr-x | misc/hooks/pre-commit-black | 10 | ||||
| -rwxr-xr-x | misc/hooks/pre-commit-clang-format | 10 | ||||
| -rw-r--r-- | platform/android/export/export.cpp | 2 |
4 files changed, 16 insertions, 13 deletions
diff --git a/editor/animation_track_editor.cpp b/editor/animation_track_editor.cpp index f10e439f10..b7c8769f64 100644 --- a/editor/animation_track_editor.cpp +++ b/editor/animation_track_editor.cpp @@ -754,14 +754,17 @@ public: for (Map<int, List<float>>::Element *E = key_ofs_map.front(); E; E = E->next()) { + int key = 0; for (List<float>::Element *F = E->value().front(); F; F = F->next()) { float key_ofs = F->get(); - if (from != key_ofs) + if (from != key_ofs) { + key++; continue; + } int track = E->key(); - key_ofs_map[track][key_ofs] = to; + key_ofs_map[track][key] = to; if (setting) return; diff --git a/misc/hooks/pre-commit-black b/misc/hooks/pre-commit-black index 633b432b89..76d97294da 100755 --- a/misc/hooks/pre-commit-black +++ b/misc/hooks/pre-commit-black @@ -6,7 +6,7 @@ ################################################################## # SETTINGS # Set path to black binary. -BLACK=`which black` +BLACK=`which black 2>/dev/null` BLACK_OPTIONS="-l 120" # Remove any older patches from previous commits. Set to true or false. @@ -18,7 +18,7 @@ FILE_EXTS="py" # Use pygmentize instead of cat to parse diff with highlighting. # Install it with `pip install pygments` (Linux) or `easy_install Pygments` (Mac) -PYGMENTIZE=`which pygmentize` +PYGMENTIZE=`which pygmentize 2>/dev/null` if [ ! -z "$PYGMENTIZE" ]; then READER="pygmentize -l diff" else @@ -26,13 +26,13 @@ else fi # Path to zenity -ZENITY=`which zenity` +ZENITY=`which zenity 2>/dev/null` # Path to xmessage -XMSG=`which xmessage` +XMSG=`which xmessage 2>/dev/null` # Path to powershell (Windows only) -PWSH=`which powershell` +PWSH=`which powershell 2>/dev/null` ################################################################## # There should be no need to change anything below this line. diff --git a/misc/hooks/pre-commit-clang-format b/misc/hooks/pre-commit-clang-format index 5a48aa1bfa..4e1fbdeb20 100755 --- a/misc/hooks/pre-commit-clang-format +++ b/misc/hooks/pre-commit-clang-format @@ -16,7 +16,7 @@ ################################################################## # SETTINGS # Set path to clang-format binary. -CLANG_FORMAT=`which clang-format` +CLANG_FORMAT=`which clang-format 2>/dev/null` # Remove any older patches from previous commits. Set to true or false. DELETE_OLD_PATCHES=false @@ -31,7 +31,7 @@ FILE_EXTS=".c .h .cpp .hpp .cc .hh .cxx .m .mm .inc .java .glsl" # Use pygmentize instead of cat to parse diff with highlighting. # Install it with `pip install pygments` (Linux) or `easy_install Pygments` (Mac) -PYGMENTIZE=`which pygmentize` +PYGMENTIZE=`which pygmentize 2>/dev/null` if [ ! -z "$PYGMENTIZE" ]; then READER="pygmentize -l diff" else @@ -39,13 +39,13 @@ else fi # Path to zenity -ZENITY=`which zenity` +ZENITY=`which zenity 2>/dev/null` # Path to xmessage -XMSG=`which xmessage` +XMSG=`which xmessage 2>/dev/null` # Path to powershell (Windows only) -PWSH=`which powershell` +PWSH=`which powershell 2>/dev/null` ################################################################## # There should be no need to change anything below this line. diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp index 1eb1ee0d29..71febd3433 100644 --- a/platform/android/export/export.cpp +++ b/platform/android/export/export.cpp @@ -1699,7 +1699,7 @@ public: valid = false; } else { Error errn; - DirAccessRef da = DirAccess::open(sdk_path.plus_file("tools"), &errn); + DirAccessRef da = DirAccess::open(sdk_path.plus_file("platform-tools"), &errn); if (errn != OK) { err += TTR("Invalid Android SDK path for custom build in Editor Settings.") + "\n"; valid = false; |