diff --git a/build_files/windows/check_submodules.cmd b/build_files/windows/check_submodules.cmd deleted file mode 100644 index 9138870f838..00000000000 --- a/build_files/windows/check_submodules.cmd +++ /dev/null @@ -1,20 +0,0 @@ -if NOT exist "%BLENDER_DIR%\source\tools\.git" ( - echo Checking out sub-modules - if not "%GIT%" == "" ( - "%GIT%" submodule update --init --recursive --progress - if errorlevel 1 goto FAIL - "%GIT%" submodule foreach git checkout main - if errorlevel 1 goto FAIL - "%GIT%" submodule foreach git pull --rebase origin main - if errorlevel 1 goto FAIL - goto EOF - ) else ( - echo Blender submodules not found, and git not found in path to retrieve them. - goto FAIL - ) -) -goto EOF - -:FAIL -exit /b 1 -:EOF \ No newline at end of file diff --git a/build_files/windows/format.cmd b/build_files/windows/format.cmd index 95440cb1818..c68286738ab 100644 --- a/build_files/windows/format.cmd +++ b/build_files/windows/format.cmd @@ -14,7 +14,7 @@ if NOT EXIST %PYTHON% ( exit /b 1 ) -set FORMAT_PATHS=%BLENDER_DIR%\source\tools\utils_maintenance\clang_format_paths.py +set FORMAT_PATHS=%BLENDER_DIR%\tools\utils_maintenance\clang_format_paths.py REM The formatting script expects clang-format to be in the current PATH. set PATH=%CF_PATH%;%PATH% diff --git a/make.bat b/make.bat index 239be60ebf0..b81f679654b 100644 --- a/make.bat +++ b/make.bat @@ -113,9 +113,6 @@ if "%TEST%" == "1" ( goto EOF ) -call "%BLENDER_DIR%\build_files\windows\check_submodules.cmd" -if errorlevel 1 goto EOF - if "%BUILD_WITH_NINJA%" == "" ( call "%BLENDER_DIR%\build_files\windows\configure_msbuild.cmd" if errorlevel 1 goto EOF