Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2018-08-22 17:07:39 +0300
committerSergey Sharybin <sergey.vfx@gmail.com>2018-08-22 17:07:57 +0300
commit6a681981e4598f07591a4b99f624f96aea3d2522 (patch)
treecb0de0efff58dfdba1c22ed61c90794c00fb3470 /source/blender/modifiers/intern/MOD_multires.c
parent9dd279cbdf93b21598267f1860257f0f81837732 (diff)
Multires: Fix reshape when active level is lower than the total one
Diffstat (limited to 'source/blender/modifiers/intern/MOD_multires.c')
-rw-r--r--source/blender/modifiers/intern/MOD_multires.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_multires.c b/source/blender/modifiers/intern/MOD_multires.c
index 6e51b229ec5..1298ad63604 100644
--- a/source/blender/modifiers/intern/MOD_multires.c
+++ b/source/blender/modifiers/intern/MOD_multires.c
@@ -147,6 +147,7 @@ static Mesh *applyModifier_subdiv(ModifierData *md,
Mesh *mesh)
{
const bool use_render_params = (ctx->flag & MOD_APPLY_RENDER);
+ const bool ignore_simplify = (ctx->flag & MOD_APPLY_IGNORE_SIMPLIFY);
const Scene *scene = DEG_get_evaluated_scene(ctx->depsgraph);
Object *object = ctx->object;
Mesh *result = mesh;
@@ -155,7 +156,7 @@ static Mesh *applyModifier_subdiv(ModifierData *md,
BKE_multires_subdiv_settings_init(&subdiv_settings, mmd);
SubdivToMeshSettings mesh_settings;
BKE_multires_subdiv_mesh_settings_init(
- &mesh_settings, scene, object, mmd, use_render_params);
+ &mesh_settings, scene, object, mmd, use_render_params, ignore_simplify);
if (subdiv_settings.level == 0 || mesh_settings.resolution < 3) {
/* NOTE: Shouldn't really happen, is supposed to be catched by
* isDisabled() callback.