Merge branch 'blender2.7'

This commit is contained in:
Brecht Van Lommel 2019-03-22 18:18:37 +01:00
commit 9c5c91cc7c
1 changed files with 1 additions and 0 deletions

View File

@ -253,6 +253,7 @@ ccl_device_intersect bool scene_intersect_local(KernelGlobals *kg,
PROFILING_INIT(kg, PROFILING_INTERSECT_LOCAL);
if(!scene_intersect_valid(&ray)) {
local_isect->num_hits = 0;
return false;
}
#ifdef __EMBREE__