Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: clang format, warning

Browse Source
This commit is contained in:
Campbell Barton
2020-06-04 01:18:14 +10:00
parent 51cd6d22c5
commit de9c04c287
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
intern/cycles/kernel/closure/bsdf.h
View File

@@ -458,7 +458,8 @@ ccl_device_inline int bsdf_sample(KernelGlobals *kg,
} }
else { else {
/* Shadow terminator offset. */ /* Shadow terminator offset. */
const float frequency_multiplier = kernel_tex_fetch(__objects, sd->object).shadow_terminator_offset; const float frequency_multiplier =
kernel_tex_fetch(__objects, sd->object).shadow_terminator_offset;
if (frequency_multiplier > 1.0f) { if (frequency_multiplier > 1.0f) {
*eval *= shift_cos_in(dot(*omega_in, sc->N), frequency_multiplier); *eval *= shift_cos_in(dot(*omega_in, sc->N), frequency_multiplier);
} }
@@ -581,7 +582,8 @@ ccl_device_inline
} }
} }
/* Shadow terminator offset. */ /* Shadow terminator offset. */
const float frequency_multiplier = kernel_tex_fetch(__objects, sd->object).shadow_terminator_offset; const float frequency_multiplier =
kernel_tex_fetch(__objects, sd->object).shadow_terminator_offset;
if (frequency_multiplier > 1.0f) { if (frequency_multiplier > 1.0f) {
eval *= shift_cos_in(dot(omega_in, sc->N), frequency_multiplier); eval *= shift_cos_in(dot(omega_in, sc->N), frequency_multiplier);
} }

2
source/blender/blenloader/intern/writefile.c
View File

@@ -529,7 +529,7 @@ static void mywrite_id_begin(WriteData *wd, ID *id)
* *
* Only does something when storing an undo step. * Only does something when storing an undo step.
*/ */
static void mywrite_id_end(WriteData *wd, ID *id) static void mywrite_id_end(WriteData *wd, ID *UNUSED(id))
{ {
if (wd->use_memfile) { if (wd->use_memfile) {
/* Very important to do it after every ID write now, otherwise we cannot know whether a /* Very important to do it after every ID write now, otherwise we cannot know whether a