From fe86375d1c636a6ba95f0f9e9a0b4a9fdd883030 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 13 Nov 2019 16:58:32 +0100 Subject: Force sculpting on highest multires level This is a workaround for T58473 to avoid likely event of ruining sculpted data. Differential Revision: https://developer.blender.org/D6244 --- source/blender/blenkernel/intern/paint.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'source/blender/blenkernel/intern/paint.c') diff --git a/source/blender/blenkernel/intern/paint.c b/source/blender/blenkernel/intern/paint.c index cc9d1b98ba4..46ef24be5e9 100644 --- a/source/blender/blenkernel/intern/paint.c +++ b/source/blender/blenkernel/intern/paint.c @@ -60,6 +60,7 @@ #include "BKE_mesh_mapping.h" #include "BKE_mesh_runtime.h" #include "BKE_modifier.h" +#include "BKE_multires.h" #include "BKE_object.h" #include "BKE_paint.h" #include "BKE_pbvh.h" @@ -1117,7 +1118,7 @@ MultiresModifierData *BKE_sculpt_multires_active(Scene *scene, Object *ob) continue; } - if (mmd->sculptlvl > 0) { + if (BKE_multires_sculpt_level_get(mmd) > 0) { return mmd; } else { @@ -1360,7 +1361,7 @@ int BKE_sculpt_mask_layers_ensure(Object *ob, MultiresModifierData *mmd) * isn't one already */ if (mmd && !CustomData_has_layer(&me->ldata, CD_GRID_PAINT_MASK)) { GridPaintMask *gmask; - int level = max_ii(1, mmd->sculptlvl); + int level = max_ii(1, BKE_multires_sculpt_level_get(mmd)); int gridsize = BKE_ccg_gridsize(level); int gridarea = gridsize * gridsize; int i, j; -- cgit v1.2.3