[Bf-blender-cvs] [389d5504120] blender-v2.83-release: Fix T77106: Cycles crash baking with AO shader node

[Garry R. Osgood]

Commit: 389d5504120fb1a331a13118979a896b7e31ee0f
Author: Garry R. Osgood
Date:   Tue Jun 2 05:55:59 2020 +0200
Branches: blender-v2.83-release
https://developer.blender.org/rB389d5504120fb1a331a13118979a896b7e31ee0f

Fix T77106: Cycles crash baking with AO shader node

Differential Revision: https://developer.blender.org/D7890

===================================================================

M	intern/cycles/kernel/bvh/bvh.h

===================================================================

diff --git a/intern/cycles/kernel/bvh/bvh.h b/intern/cycles/kernel/bvh/bvh.h
index b3992c03a9a..9b9df883b62 100644
--- a/intern/cycles/kernel/bvh/bvh.h
+++ b/intern/cycles/kernel/bvh/bvh.h
@@ -300,7 +300,9 @@ ccl_device_intersect bool scene_intersect_local(KernelGlobals *kg,
   // Is set to zero on miss or if ray is aborted, so can be used as return value
   uint p5 = max_hits;
 
-  local_isect->num_hits = 0;  // Initialize hit count to zero
+  if (local_isect) {
+    local_isect->num_hits = 0;  // Initialize hit count to zero
+  }
   optixTrace(scene_intersect_valid(ray) ? kernel_data.bvh.scene : 0,
              ray->P,
              ray->D,
@@ -323,7 +325,9 @@ ccl_device_intersect bool scene_intersect_local(KernelGlobals *kg,
   return p5;
 #  else /* __KERNEL_OPTIX__ */
   if (!scene_intersect_valid(ray)) {
-    local_isect->num_hits = 0;
+    if (local_isect) {
+      local_isect->num_hits = 0;
+    }
     return false;
   }