[Bf-blender-cvs] [27941b027b2] blender-v2.83-release: Windows: Fix working directory issue in debug batch files

Ray Molenkamp noreply at git.blender.org
Fri Apr 17 16:04:55 CEST 2020


Commit: 27941b027b245e4814074698a9bdc193a8d0a0d3
Author: Ray Molenkamp
Date:   Fri Apr 17 08:04:49 2020 -0600
Branches: blender-v2.83-release
https://developer.blender.org/rB27941b027b245e4814074698a9bdc193a8d0a0d3

Windows: Fix working directory issue in debug batch files

Batch files did not work when you ran them from a
different working directory.

===================================================================

M	release/windows/batch/blender_debug_gpu.cmd
M	release/windows/batch/blender_debug_gpu_glitchworkaround.cmd
M	release/windows/batch/blender_debug_log.cmd
M	release/windows/batch/blender_factory_startup.cmd
M	release/windows/batch/blender_oculus.cmd

===================================================================

diff --git a/release/windows/batch/blender_debug_gpu.cmd b/release/windows/batch/blender_debug_gpu.cmd
index 3413b6639e4..46d126ab621 100644
--- a/release/windows/batch/blender_debug_gpu.cmd
+++ b/release/windows/batch/blender_debug_gpu.cmd
@@ -12,5 +12,5 @@ mkdir "%temp%\blender\debug_logs" > NUL 2>&1
 echo.
 echo Starting blender and waiting for it to exit....
 set PYTHONPATH=
-blender --debug --debug-gpu --python-expr "import bpy; bpy.ops.wm.sysinfo(filepath=r'%temp%\blender\debug_logs\blender_system_info.txt')" > "%temp%\blender\debug_logs\blender_debug_output.txt" 2>&1 < %0
+"%~dp0\blender" --debug --debug-gpu --python-expr "import bpy; bpy.ops.wm.sysinfo(filepath=r'%temp%\blender\debug_logs\blender_system_info.txt')" > "%temp%\blender\debug_logs\blender_debug_output.txt" 2>&1 < %0
 explorer "%temp%\blender\debug_logs"
\ No newline at end of file
diff --git a/release/windows/batch/blender_debug_gpu_glitchworkaround.cmd b/release/windows/batch/blender_debug_gpu_glitchworkaround.cmd
index fa701cf7dee..bc322166ae3 100644
--- a/release/windows/batch/blender_debug_gpu_glitchworkaround.cmd
+++ b/release/windows/batch/blender_debug_gpu_glitchworkaround.cmd
@@ -12,5 +12,5 @@ mkdir "%temp%\blender\debug_logs" > NUL 2>&1
 echo.
 echo Starting blender and waiting for it to exit....
 set PYTHONPATH=
-blender --debug --debug-gpu --debug-gpu-force-workarounds --python-expr "import bpy; bpy.ops.wm.sysinfo(filepath=r'%temp%\blender\debug_logs\blender_system_info.txt')" > "%temp%\blender\debug_logs\blender_debug_output.txt" 2>&1 < %0
+"%~dp0\blender" --debug --debug-gpu --debug-gpu-force-workarounds --python-expr "import bpy; bpy.ops.wm.sysinfo(filepath=r'%temp%\blender\debug_logs\blender_system_info.txt')" > "%temp%\blender\debug_logs\blender_debug_output.txt" 2>&1 < %0
 explorer "%temp%\blender\debug_logs"
\ No newline at end of file
diff --git a/release/windows/batch/blender_debug_log.cmd b/release/windows/batch/blender_debug_log.cmd
index 2d708ea9104..9af0e93fbde 100644
--- a/release/windows/batch/blender_debug_log.cmd
+++ b/release/windows/batch/blender_debug_log.cmd
@@ -12,5 +12,5 @@ mkdir "%temp%\blender\debug_logs" > NUL 2>&1
 echo.
 echo Starting blender and waiting for it to exit....
 set PYTHONPATH=
-blender --debug --debug-cycles --python-expr "import bpy; bpy.ops.wm.sysinfo(filepath=r'%temp%\blender\debug_logs\blender_system_info.txt')" > "%temp%\blender\debug_logs\blender_debug_output.txt" 2>&1 < %0
+"%~dp0\blender" --debug --debug-cycles --python-expr "import bpy; bpy.ops.wm.sysinfo(filepath=r'%temp%\blender\debug_logs\blender_system_info.txt')" > "%temp%\blender\debug_logs\blender_debug_output.txt" 2>&1 < %0
 explorer "%temp%\blender\debug_logs"
diff --git a/release/windows/batch/blender_factory_startup.cmd b/release/windows/batch/blender_factory_startup.cmd
index a1ee75e512d..51bf5059e31 100644
--- a/release/windows/batch/blender_factory_startup.cmd
+++ b/release/windows/batch/blender_factory_startup.cmd
@@ -12,5 +12,5 @@ mkdir "%temp%\blender\debug_logs" > NUL 2>&1
 echo.
 echo Starting blender and waiting for it to exit....
 set PYTHONPATH=
-blender --factory-startup --python-expr "import bpy; bpy.ops.wm.sysinfo(filepath=r'%temp%\blender\debug_logs\blender_system_info.txt')" > "%temp%\blender\debug_logs\blender_debug_output.txt" 2>&1
+"%~dp0\blender" --factory-startup --python-expr "import bpy; bpy.ops.wm.sysinfo(filepath=r'%temp%\blender\debug_logs\blender_system_info.txt')" > "%temp%\blender\debug_logs\blender_debug_output.txt" 2>&1
 explorer "%temp%\blender\debug_logs"
diff --git a/release/windows/batch/blender_oculus.cmd b/release/windows/batch/blender_oculus.cmd
index ffb725eb32f..cb136386a13 100644
--- a/release/windows/batch/blender_oculus.cmd
+++ b/release/windows/batch/blender_oculus.cmd
@@ -11,4 +11,4 @@ echo Note that OpenXR support in Oculus is considered a preview. Use with care!
 echo.
 pause
 set XR_RUNTIME_JSON=%~dp0oculus.json
-blender
+"%~dp0\blender"



More information about the Bf-blender-cvs mailing list