Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--intern/cycles/kernel/kernels/cpu/kernel_cpu_impl.h2
-rw-r--r--intern/cycles/render/camera.cpp2
2 files changed, 4 insertions, 0 deletions
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,