1 files changed, 6 insertions, 6 deletions

diff --git a/source/blender/editors/object/object_bake_api.c b/source/blender/editors/object/object_bake_api.c
index 26f5b21a311..475e0e581fb 100644
--- a/source/blender/editors/object/object_bake_api.c
+++ b/source/blender/editors/object/object_bake_api.c
@@ -1532,22 +1532,22 @@ static int bake(const BakeAPIRender *bkr,
           if (md) {
             mode = md->mode;
             md->mode &= ~eModifierMode_Render;
-          }
 
-          /* Evaluate modifiers again. */
-          me_nores = BKE_mesh_new_from_object(NULL, ob_low_eval, false, false);
-          bake_targets_populate_pixels(bkr, &targets, ob_low, me_nores, pixel_array_low);
+            /* Evaluate modifiers again. */
+            me_nores = BKE_mesh_new_from_object(NULL, ob_low_eval, false, false);
+            bake_targets_populate_pixels(bkr, &targets, ob_low, me_nores, pixel_array_low);
+          }
 
           RE_bake_normal_world_to_tangent(pixel_array_low,
                                           targets.num_pixels,
                                           targets.num_channels,
                                           targets.result,
-                                          me_nores,
+                                          (me_nores) ? me_nores : me_low_eval,
                                           bkr->normal_swizzle,
                                           ob_low_eval->obmat);
-          BKE_id_free(NULL, &me_nores->id);
 
           if (md) {
+            BKE_id_free(NULL, &me_nores->id);
             md->mode = mode;
           }
         }