kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles: Cleanup, style

Browse Source 
I wouldn't mind changing style to have space after keyword, but there was
no official code style change proposed.
This commit is contained in:
Sergey Sharybin 2018-08-24 14:36:18 +02:00
parent e92e90c30e
commit 658a9c6cf5
20 changed files with 50 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
intern/cycles/app/cycles_cubin_cc.cpp
View File

@ -159,8 +159,7 @@ bool link_ptxas(CompilationSettings &settings)
" --gpu-name sm_" + std::to_string(settings.target_arch) + " --gpu-name sm_" + std::to_string(settings.target_arch) +
" -m" + std::to_string(settings.bits); " -m" + std::to_string(settings.bits);
if (settings.verbose) if(settings.verbose) {
{
ptx += " --verbose"; ptx += " --verbose";
printf("%s\n", ptx.c_str()); printf("%s\n", ptx.c_str());
} }

6
intern/cycles/kernel/osl/osl_closures.cpp
View File

@ -200,11 +200,9 @@ public:
void setup(ShaderData *sd, int path_flag, float3 weight) void setup(ShaderData *sd, int path_flag, float3 weight)
{ {
if(!skip(sd, path_flag, LABEL_GLOSSY)) if(!skip(sd, path_flag, LABEL_GLOSSY)) {
{
PrincipledHairBSDF *bsdf = (PrincipledHairBSDF*)alloc(sd, path_flag, weight); PrincipledHairBSDF *bsdf = (PrincipledHairBSDF*)alloc(sd, path_flag, weight);
if (!bsdf) if(!bsdf) {
{
return; return;
} }

6
intern/cycles/util/util_math_intersect.h
View File

@ -136,11 +136,11 @@ ccl_device_forceinline bool ray_triangle_intersect(
#if defined(__KERNEL_SSE2__) && defined (__KERNEL_SSE__) #if defined(__KERNEL_SSE2__) && defined (__KERNEL_SSE__)
int uvw_sign = movemask(UVWW) & 0x7; int uvw_sign = movemask(UVWW) & 0x7;
if (uvw_sign != 0) if(uvw_sign != 0) {
{ if(uvw_sign != 0x7) {
if (uvw_sign != 0x7)
return false; return false;
} }
}
#else #else
const float minUVW = min(U, min(V, W)); const float minUVW = min(U, min(V, W));
const float maxUVW = max(U, max(V, W)); const float maxUVW = max(U, max(V, W));