Merge branch 'blender-v2.82-release'

3 files changed, 12 insertions, 7 deletions

diff --git a/source/blender/blenkernel/intern/fluid.c b/source/blender/blenkernel/intern/fluid.c
index 8acc2df4aea..1b483960c91 100644
--- a/source/blender/blenkernel/intern/fluid.c
+++ b/source/blender/blenkernel/intern/fluid.c
@@ -3719,7 +3719,7 @@ static void BKE_fluid_modifier_processDomain(FluidModifierData *mmd,
         has_data = manta_read_data(mds->fluid, mmd, data_frame);
       }
       if (with_liquid) {
-        if (!baking_data && !baking_particles && !baking_mesh) {
+        if (!baking_data && !baking_particles && !baking_mesh && !mode_replay) {
           has_data = manta_update_liquid_structures(mds->fluid, mmd, data_frame);
         }
         else {
diff --git a/source/blender/blenkernel/intern/gpencil.c b/source/blender/blenkernel/intern/gpencil.c
index 98c8f46970f..b1cf8ad8570 100644
--- a/source/blender/blenkernel/intern/gpencil.c
+++ b/source/blender/blenkernel/intern/gpencil.c
@@ -939,9 +939,15 @@ bGPDframe *BKE_gpencil_layer_getframe(bGPDlayer *gpl, int cframe, eGP_GetFrame_M
       gpl->actframe = gpf;
     }
     else {
-      /* unresolved errogenous situation! */
-      CLOG_STR_ERROR(&LOG, "cannot find appropriate gp-frame");
-      /* gpl->actframe should still be NULL */
+      /* If delete first frame, need to find one. */
+      if (gpl->frames.first != NULL) {
+        gpl->actframe = gpl->frames.first;
+      }
+      else {
+        /* unresolved errogenous situation! */
+        CLOG_STR_ERROR(&LOG, "cannot find appropriate gp-frame");
+        /* gpl->actframe should still be NULL */
+      }
     }
   }
   else {
diff --git a/source/blender/editors/mesh/editmesh_tools.c b/source/blender/editors/mesh/editmesh_tools.c
index b6b28624c27..0fea21710e9 100644
--- a/source/blender/editors/mesh/editmesh_tools.c
+++ b/source/blender/editors/mesh/editmesh_tools.c
@@ -96,13 +96,12 @@ static int edbm_subdivide_exec(bContext *C, wmOperator *op)
   const float smooth = RNA_float_get(op->ptr, "smoothness");
   const float fractal = RNA_float_get(op->ptr, "fractal") / 2.5f;
   const float along_normal = RNA_float_get(op->ptr, "fractal_along_normal");
+  const bool use_quad_tri = !RNA_boolean_get(op->ptr, "ngon");
 
-  if (RNA_boolean_get(op->ptr, "ngon") &&
-      RNA_enum_get(op->ptr, "quadcorner") == SUBD_CORNER_STRAIGHT_CUT) {
+  if (use_quad_tri && RNA_enum_get(op->ptr, "quadcorner") == SUBD_CORNER_STRAIGHT_CUT) {
     RNA_enum_set(op->ptr, "quadcorner", SUBD_CORNER_INNERVERT);
   }
   const int quad_corner_type = RNA_enum_get(op->ptr, "quadcorner");
-  const bool use_quad_tri = !RNA_boolean_get(op->ptr, "ngon");
   const int seed = RNA_int_get(op->ptr, "seed");
 
   ViewLayer *view_layer = CTX_data_view_layer(C);