1 files changed, 15 insertions, 7 deletions

diff --git a/intern/cycles/render/bake.cpp b/intern/cycles/render/bake.cpp
index c00451e931f..439ebdedb8e 100644
--- a/intern/cycles/render/bake.cpp
+++ b/intern/cycles/render/bake.cpp
@@ -20,6 +20,7 @@
 #include "render/mesh.h"
 #include "render/object.h"
 #include "render/shader.h"
+#include "render/stats.h"
 
 #include "util/util_foreach.h"
 
@@ -32,10 +33,11 @@ static int aa_samples(Scene *scene, Object *object, ShaderEvalType type)
   }
   else if (type == SHADER_EVAL_NORMAL) {
     /* Only antialias normal if mesh has bump mapping. */
-    if (object->geometry) {
-      foreach (Shader *shader, object->geometry->used_shaders) {
+    if (object->get_geometry()) {
+      foreach (Node *node, object->get_geometry()->get_used_shaders()) {
+        Shader *shader = static_cast<Shader *>(node);
         if (shader->has_bump) {
-          return scene->integrator->aa_samples;
+          return scene->integrator->get_aa_samples();
         }
       }
     }
@@ -43,7 +45,7 @@ static int aa_samples(Scene *scene, Object *object, ShaderEvalType type)
     return 1;
   }
   else {
-    return scene->integrator->aa_samples;
+    return scene->integrator->get_aa_samples();
   }
 }
 
@@ -111,7 +113,7 @@ void BakeManager::set(Scene *scene,
   }
 
   /* create device and update scene */
-  scene->film->tag_update(scene);
+  scene->film->tag_modified();
   scene->integrator->tag_update(scene);
 
   need_update = true;
@@ -125,6 +127,12 @@ void BakeManager::device_update(Device * /*device*/,
   if (!need_update)
     return;
 
+  scoped_callback_timer timer([scene](double time) {
+    if (scene->update_stats) {
+      scene->update_stats->bake.times.add_entry({"device_update", time});
+    }
+  });
+
   KernelIntegrator *kintegrator = &dscene->data.integrator;
   KernelBake *kbake = &dscene->data.bake;
 
@@ -133,8 +141,8 @@ void BakeManager::device_update(Device * /*device*/,
 
   int object_index = 0;
   foreach (Object *object, scene->objects) {
-    const Geometry *geom = object->geometry;
-    if (object->name == object_name && geom->type == Geometry::MESH) {
+    const Geometry *geom = object->get_geometry();
+    if (object->name == object_name && geom->geometry_type == Geometry::MESH) {
       kbake->object_index = object_index;
       kbake->tri_offset = geom->prim_offset;
       kintegrator->aa_samples = aa_samples(scene, object, type);