From 7d83e7a9dffe8bb24217d749c33cdb24f3b7dc49 Mon Sep 17 00:00:00 2001 From: Alexander Gordeev Date: Thu, 20 Jun 2019 14:11:20 +0200 Subject: Fix T65877: crash when baking in sculpt mode Also fixes bug where mesh with multires modifier is invisible in render while in sculpt mode. Differential Revision: https://developer.blender.org/D5099 --- source/blender/modifiers/intern/MOD_multires.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'source/blender/modifiers/intern/MOD_multires.c') diff --git a/source/blender/modifiers/intern/MOD_multires.c b/source/blender/modifiers/intern/MOD_multires.c index c61ebe0448c..c64d9be1158 100644 --- a/source/blender/modifiers/intern/MOD_multires.c +++ b/source/blender/modifiers/intern/MOD_multires.c @@ -185,7 +185,10 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes * accessible via MVert. For this reason we do not evaluate multires to * grids when orco is requested. */ const bool for_orco = (ctx->flag & MOD_APPLY_ORCO) != 0; - if ((ctx->object->mode & OB_MODE_SCULPT) && !for_orco) { + /* Needed when rendering or baking will in sculpt mode. */ + const bool for_render = (ctx->flag & MOD_APPLY_RENDER) != 0; + + if ((ctx->object->mode & OB_MODE_SCULPT) && !for_orco && !for_render) { /* NOTE: CCG takes ownership over Subdiv. */ result = multires_as_ccg(mmd, ctx, mesh, subdiv); result->runtime.subdiv_ccg_tot_level = mmd->totlvl; -- cgit v1.2.3