Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-02-19 21:00:46 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-02-19 21:00:46 +0300
commite2a90b804566843416e15558095083ec2e735195 (patch)
tree41aec97570e494ad3d0fb0f0e70663a5de92c408 /intern/cycles/util
parent2be29999bd4174b99afc634bb3262decccd5278d (diff)
parent667033e89e7fe5241592e72e088a19723ca906b5 (diff)
Merge branch 'blender2.7'
Diffstat (limited to 'intern/cycles/util')
-rw-r--r--intern/cycles/util/util_system.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/intern/cycles/util/util_system.cpp b/intern/cycles/util/util_system.cpp
index a79829a3dd9..2a5c4a8f012 100644
--- a/intern/cycles/util/util_system.cpp
+++ b/intern/cycles/util/util_system.cpp
@@ -341,10 +341,11 @@ bool system_call_self(const vector<string>& args)
cmd += " \"" + args[i] + "\"";
}
- /* Quiet output. */
#ifdef _WIN32
- cmd += " > nul";
+ /* Use cmd /S to avoid issues with spaces in arguments. */
+ cmd = "cmd /S /C \"" + cmd + " > nul \"";
#else
+ /* Quiet output. */
cmd += " > /dev/null";
#endif