[Bf-blender-cvs] [f6dc6caa15f] master: Fix Cycles build error when disabling some kernel features

[Imre Palik]

Commit: f6dc6caa15f33cab914bb47b8b556618bab776f6
Author: Imre Palik
Date:   Tue Sep 1 19:10:03 2020 +0200
Branches: master
https://developer.blender.org/rBf6dc6caa15f33cab914bb47b8b556618bab776f6

Fix Cycles build error when disabling some kernel features

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

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

M	intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h
M	intern/cycles/render/camera.cpp

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

diff --git a/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h b/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h
index 5aa3fb14318..51d6c23f72f 100644
--- a/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h
+++ b/intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h
@@ -140,7 +140,9 @@ void KERNEL_FUNCTION_FULL_NAME(bake)(
 #  ifdef KERNEL_STUB
   STUB_ASSERT(KERNEL_ARCH, bake);
 #  else
+#    ifdef __BAKING__
   kernel_bake_evaluate(kg, buffer, sample, x, y, offset, stride);
+#    endif
 #  endif /* KERNEL_STUB */
 }
 
diff --git a/intern/cycles/render/camera.cpp b/intern/cycles/render/camera.cpp
index bbc111cb798..0fedba7c2ca 100644
--- a/intern/cycles/render/camera.cpp
+++ b/intern/cycles/render/camera.cpp
@@ -751,7 +751,9 @@ float Camera::world_to_raster_size(float3 P)
     }
 #else
     camera_sample_panorama(&kernel_camera,
+# ifdef __CAMERA_MOTION__
                            kernel_camera_motion.data(),
+# endif
                            0.5f * full_width,
                            0.5f * full_height,
                            0.0f,