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>2018-08-28 20:15:08 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2018-08-28 20:15:08 +0300
commit871b7ba8922650c34b487fec29a9d677b1aeadfd (patch)
treea13c8635e43919aed3ad48afe096f6501bbeb9a2 /intern/cycles/app
parent55263c8a4c03c1add138e5191f98a8b68591289f (diff)
parent9fd0060c0f3458e53b38003d1388f16cb56f45d8 (diff)
Merge branch 'master' into blender2.8
Diffstat (limited to 'intern/cycles/app')
-rw-r--r--intern/cycles/app/cycles_cubin_cc.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/intern/cycles/app/cycles_cubin_cc.cpp b/intern/cycles/app/cycles_cubin_cc.cpp
index 01a1234531b..da8ca53c8df 100644
--- a/intern/cycles/app/cycles_cubin_cc.cpp
+++ b/intern/cycles/app/cycles_cubin_cc.cpp
@@ -159,8 +159,7 @@ bool link_ptxas(CompilationSettings &settings)
" --gpu-name sm_" + std::to_string(settings.target_arch) +
" -m" + std::to_string(settings.bits);
- if (settings.verbose)
- {
+ if(settings.verbose) {
ptx += " --verbose";
printf("%s\n", ptx.c_str());
}