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

Cycles: Cleanup, use explicit comparison with NULL

Browse Source
This commit is contained in:
Sergey Sharybin
2018-08-31 12:28:12 +02:00
parent 8ee76535da
commit e51f51d55d
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
intern/cycles/kernel/bvh/bvh_local.h
View File

@@ -73,10 +73,9 @@ bool BVH_FUNCTION_FULL_NAME(BVH)(KernelGlobals *kg,
int object = OBJECT_NONE; int object = OBJECT_NONE;
float isect_t = ray->t; float isect_t = ray->t;
if(local_isect) { if(local_isect != NULL) {
local_isect->num_hits = 0; local_isect->num_hits = 0;
} }
kernel_assert((local_isect == NULL) == (max_hits == 0)); kernel_assert((local_isect == NULL) == (max_hits == 0));
const int object_flag = kernel_tex_fetch(__object_flag, local_object); const int object_flag = kernel_tex_fetch(__object_flag, local_object);

3
intern/cycles/kernel/bvh/qbvh_local.h
View File

@@ -59,10 +59,9 @@ ccl_device bool BVH_FUNCTION_FULL_NAME(QBVH)(KernelGlobals *kg,
int object = OBJECT_NONE; int object = OBJECT_NONE;
float isect_t = ray->t; float isect_t = ray->t;
if(local_isect) { if(local_isect != NULL) {
local_isect->num_hits = 0; local_isect->num_hits = 0;
} }
kernel_assert((local_isect == NULL) == (max_hits == 0)); kernel_assert((local_isect == NULL) == (max_hits == 0));
const int object_flag = kernel_tex_fetch(__object_flag, local_object); const int object_flag = kernel_tex_fetch(__object_flag, local_object);