3 files changed, 15 insertions, 15 deletions

diff --git a/source/blender/editors/physics/particle_edit.c b/source/blender/editors/physics/particle_edit.c
index ef5ed806c1e..457c8ba30e6 100644
--- a/source/blender/editors/physics/particle_edit.c
+++ b/source/blender/editors/physics/particle_edit.c
@@ -4103,7 +4103,7 @@ static void brush_add_count_iter(void *__restrict iter_data_v,
   BrushAddCountIterTLSData *tls = tls_v->userdata_chunk;
   const int number = iter_data->number;
   const short size = iter_data->size;
-  const short size2 = size * size;
+  const int size2 = size * size;
   float dmx, dmy;
   if (number > 1) {
     dmx = size;
diff --git a/source/blender/editors/physics/physics_fluid.c b/source/blender/editors/physics/physics_fluid.c
index 8524870c15e..8f6b5aa8bc3 100644
--- a/source/blender/editors/physics/physics_fluid.c
+++ b/source/blender/editors/physics/physics_fluid.c
@@ -270,31 +270,31 @@ static void fluid_bake_sequence(FluidJob *job)
     *(job->do_update) = true;
   }
 
-  /* Get current pause frame (pointer) - depending on bake type */
+  /* Get current pause frame (pointer) - depending on bake type. */
   pause_frame = job->pause_frame;
 
-  /* Set frame to start point (depending on current pause frame value) */
+  /* Set frame to start point (depending on current pause frame value). */
   is_first_frame = ((*pause_frame) == 0);
   frame = is_first_frame ? mds->cache_frame_start : (*pause_frame);
 
-  /* Save orig frame and update scene frame */
+  /* Save orig frame and update scene frame. */
   orig_frame = CFRA;
   CFRA = frame;
 
-  /* Loop through selected frames */
+  /* Loop through selected frames. */
   for (; frame <= mds->cache_frame_end; frame++) {
     const float progress = (frame - mds->cache_frame_start) / (float)frames;
 
-    /* Keep track of pause frame - needed to init future loop */
+    /* Keep track of pause frame - needed to init future loop. */
     (*pause_frame) = frame;
 
-    /* If user requested stop, quit baking */
+    /* If user requested stop, quit baking. */
     if (G.is_break) {
       job->success = 0;
       return;
     }
 
-    /* Update progress bar */
+    /* Update progress bar. */
     if (job->do_update) {
       *(job->do_update) = true;
     }
@@ -304,17 +304,17 @@ static void fluid_bake_sequence(FluidJob *job)
 
     CFRA = frame;
 
-    /* Update animation system */
+    /* Update animation system. */
     ED_update_for_newframe(job->bmain, job->depsgraph);
 
-    /* If user requested stop, quit baking */
+    /* If user requested stop, quit baking. */
     if (G.is_break) {
       job->success = 0;
       return;
     }
   }
 
-  /* Restore frame position that we were on before bake */
+  /* Restore frame position that we were on before bake. */
   CFRA = orig_frame;
 }
 
@@ -355,9 +355,9 @@ static void fluid_bake_endjob(void *customdata)
   WM_set_locked_interface(G_MAIN->wm.first, false);
 
   /* Bake was successful:
-   *  Report for ended bake and how long it took */
+   * Report for ended bake and how long it took. */
   if (job->success) {
-    /* Show bake info */
+    /* Show bake info. */
     WM_reportf(
         RPT_INFO, "Fluid: %s complete! (%.2f)", job->name, PIL_check_seconds_timer() - job->start);
   }
@@ -365,7 +365,7 @@ static void fluid_bake_endjob(void *customdata)
     if (mds->error[0] != '\0') {
       WM_reportf(RPT_ERROR, "Fluid: %s failed: %s", job->name, mds->error);
     }
-    else { /* User canceled the bake */
+    else { /* User canceled the bake. */
       WM_reportf(RPT_WARNING, "Fluid: %s canceled!", job->name);
     }
   }
diff --git a/source/blender/editors/physics/physics_pointcache.c b/source/blender/editors/physics/physics_pointcache.c
index 700a94e4f93..5bd56baf41e 100644
--- a/source/blender/editors/physics/physics_pointcache.c
+++ b/source/blender/editors/physics/physics_pointcache.c
@@ -132,7 +132,7 @@ static void ptcache_job_endjob(void *customdata)
   WM_set_locked_interface(job->wm, false);
 
   WM_main_add_notifier(NC_SCENE | ND_FRAME, scene);
-  WM_main_add_notifier(NC_OBJECT | ND_POINTCACHE, job->baker->pid.ob);
+  WM_main_add_notifier(NC_OBJECT | ND_POINTCACHE, job->baker->pid.owner_id);
 }
 
 static void ptcache_free_bake(PointCache *cache)