[Bf-blender-cvs] [20ee6c0f16e] master: Fix compiler warning when building Cycles without Embree

Brecht Van Lommel noreply at git.blender.org
Fri Mar 12 15:17:18 CET 2021


Commit: 20ee6c0f16e8eebd2afc2721f9c8ec1ac53f3a06
Author: Brecht Van Lommel
Date:   Fri Mar 12 15:12:09 2021 +0100
Branches: master
https://developer.blender.org/rB20ee6c0f16e8eebd2afc2721f9c8ec1ac53f3a06

Fix compiler warning when building Cycles without Embree

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

M	intern/cycles/render/geometry.cpp

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

diff --git a/intern/cycles/render/geometry.cpp b/intern/cycles/render/geometry.cpp
index 9f8bf68dadf..de0e06828bc 100644
--- a/intern/cycles/render/geometry.cpp
+++ b/intern/cycles/render/geometry.cpp
@@ -1367,7 +1367,7 @@ void GeometryManager::device_update_bvh(Device *device,
   dscene->data.bvh.use_bvh_steps = (scene->params.num_bvh_time_steps != 0);
   dscene->data.bvh.curve_subdivisions = scene->params.curve_subdivisions();
   /* The scene handle is set in 'CPUDevice::const_copy_to' and 'OptiXDevice::const_copy_to' */
-  dscene->data.bvh.scene = NULL;
+  dscene->data.bvh.scene = 0;
 }
 
 /* Set of flags used to help determining what data has been modified or needs reallocation, so we



More information about the Bf-blender-cvs mailing list