diff --git a/intern/cycles/device/cpu/device_impl.cpp b/intern/cycles/device/cpu/device_impl.cpp
index 158a789db5a..612c391f7d5 100644
--- a/intern/cycles/device/cpu/device_impl.cpp
+++ b/intern/cycles/device/cpu/device_impl.cpp
@@ -191,7 +191,7 @@ device_ptr CPUDevice::mem_alloc_sub_ptr(device_memory &mem, size_t offset, size_
 
 void CPUDevice::const_copy_to(const char *name, void *host, size_t size)
 {
-#if WITH_EMBREE
+#ifdef WITH_EMBREE
   if (strcmp(name, "__data") == 0) {
     assert(size <= sizeof(KernelData));
 
diff --git a/source/blender/blenkernel/intern/subdiv_mesh.c b/source/blender/blenkernel/intern/subdiv_mesh.c
index fd56582f5e3..50135110a64 100644
--- a/source/blender/blenkernel/intern/subdiv_mesh.c
+++ b/source/blender/blenkernel/intern/subdiv_mesh.c
@@ -72,6 +72,9 @@ static void subdiv_mesh_ctx_cache_custom_data_layers(SubdivMeshContext *ctx)
 
 static void subdiv_mesh_prepare_accumulator(SubdivMeshContext *ctx, int num_vertices)
 {
+  if (!ctx->have_displacement) {
+    return;
+  }
   ctx->accumulated_counters = MEM_calloc_arrayN(
       num_vertices, sizeof(*ctx->accumulated_counters), "subdiv accumulated counters");
 }
@@ -424,18 +427,17 @@ static void subdiv_accumulate_vertex_displacement(SubdivMeshContext *ctx,
                                                   const float v,
                                                   MVert *subdiv_vert)
 {
+  /* Accumulate displacement. */
   Subdiv *subdiv = ctx->subdiv;
   const int subdiv_vertex_index = subdiv_vert - ctx->subdiv_mesh->mvert;
   float dummy_P[3], dPdu[3], dPdv[3], D[3];
   BKE_subdiv_eval_limit_point_and_derivatives(subdiv, ptex_face_index, u, v, dummy_P, dPdu, dPdv);
 
-  /* Accumulate displacement if needed. */
-  if (ctx->have_displacement) {
-    /* NOTE: The subdivided mesh is allocated in this module, and its vertices are kept at zero
-     * locations as a default calloc(). */
-    BKE_subdiv_eval_displacement(subdiv, ptex_face_index, u, v, dPdu, dPdv, D);
-    add_v3_v3(subdiv_vert->co, D);
-  }
+  /* NOTE: The subdivided mesh is allocated in this module, and its vertices are kept at zero
+   * locations as a default calloc(). */
+  BKE_subdiv_eval_displacement(subdiv, ptex_face_index, u, v, dPdu, dPdv, D);
+  add_v3_v3(subdiv_vert->co, D);
+
   if (ctx->accumulated_counters) {
     ++ctx->accumulated_counters[subdiv_vertex_index];
   }
@@ -554,12 +556,13 @@ static void evaluate_vertex_and_apply_displacement_interpolate(
   add_v3_v3(subdiv_vert->co, D);
 }
 
-static void subdiv_mesh_vertex_every_corner_or_edge(const SubdivForeachContext *foreach_context,
-                                                    void *UNUSED(tls),
-                                                    const int ptex_face_index,
-                                                    const float u,
-                                                    const float v,
-                                                    const int subdiv_vertex_index)
+static void subdiv_mesh_vertex_displacement_every_corner_or_edge(
+    const SubdivForeachContext *foreach_context,
+    void *UNUSED(tls),
+    const int ptex_face_index,
+    const float u,
+    const float v,
+    const int subdiv_vertex_index)
 {
   SubdivMeshContext *ctx = foreach_context->user_data;
   Mesh *subdiv_mesh = ctx->subdiv_mesh;
@@ -568,31 +571,32 @@ static void subdiv_mesh_vertex_every_corner_or_edge(const SubdivForeachContext *
   subdiv_accumulate_vertex_displacement(ctx, ptex_face_index, u, v, subdiv_vert);
 }
 
-static void subdiv_mesh_vertex_every_corner(const SubdivForeachContext *foreach_context,
-                                            void *tls,
-                                            const int ptex_face_index,
-                                            const float u,
-                                            const float v,
-                                            const int UNUSED(coarse_vertex_index),
-                                            const int UNUSED(coarse_poly_index),
-                                            const int UNUSED(coarse_corner),
-                                            const int subdiv_vertex_index)
+static void subdiv_mesh_vertex_displacement_every_corner(
+    const SubdivForeachContext *foreach_context,
+    void *tls,
+    const int ptex_face_index,
+    const float u,
+    const float v,
+    const int UNUSED(coarse_vertex_index),
+    const int UNUSED(coarse_poly_index),
+    const int UNUSED(coarse_corner),
+    const int subdiv_vertex_index)
 {
-  subdiv_mesh_vertex_every_corner_or_edge(
+  subdiv_mesh_vertex_displacement_every_corner_or_edge(
       foreach_context, tls, ptex_face_index, u, v, subdiv_vertex_index);
 }
 
-static void subdiv_mesh_vertex_every_edge(const SubdivForeachContext *foreach_context,
-                                          void *tls,
-                                          const int ptex_face_index,
-                                          const float u,
-                                          const float v,
-                                          const int UNUSED(coarse_edge_index),
-                                          const int UNUSED(coarse_poly_index),
-                                          const int UNUSED(coarse_corner),
-                                          const int subdiv_vertex_index)
+static void subdiv_mesh_vertex_displacement_every_edge(const SubdivForeachContext *foreach_context,
+                                                       void *tls,
+                                                       const int ptex_face_index,
+                                                       const float u,
+                                                       const float v,
+                                                       const int UNUSED(coarse_edge_index),
+                                                       const int UNUSED(coarse_poly_index),
+                                                       const int UNUSED(coarse_corner),
+                                                       const int subdiv_vertex_index)
 {
-  subdiv_mesh_vertex_every_corner_or_edge(
+  subdiv_mesh_vertex_displacement_every_corner_or_edge(
       foreach_context, tls, ptex_face_index, u, v, subdiv_vertex_index);
 }
 
@@ -1078,12 +1082,8 @@ static void setup_foreach_callbacks(const SubdivMeshContext *subdiv_context,
   foreach_context->topology_info = subdiv_mesh_topology_info;
   /* Every boundary geometry. Used for displacement averaging. */
   if (subdiv_context->have_displacement) {
-    foreach_context->vertex_every_corner = subdiv_mesh_vertex_every_corner;
-    foreach_context->vertex_every_edge = subdiv_mesh_vertex_every_edge;
-  }
-  else {
-    foreach_context->vertex_every_corner = subdiv_mesh_vertex_every_corner;
-    foreach_context->vertex_every_edge = subdiv_mesh_vertex_every_edge;
+    foreach_context->vertex_every_corner = subdiv_mesh_vertex_displacement_every_corner;
+    foreach_context->vertex_every_edge = subdiv_mesh_vertex_displacement_every_edge;
   }
   foreach_context->vertex_corner = subdiv_mesh_vertex_corner;
   foreach_context->vertex_edge = subdiv_mesh_vertex_edge;