diff options
| author | Jacques Lucke <mail@jlucke.com> | 2018-12-20 13:17:45 +0300 |
|---|---|---|
| committer | Jacques Lucke <mail@jlucke.com> | 2018-12-20 13:17:45 +0300 |
| commit | c02f67fa8ae56c8b9e5015b0228de9844a015b71 (patch) | |
| tree | 1be1317494af436ca799fc5a10438c9e3aed1cb6 /source/blender/modifiers | |
| parent | ae028ef206cff475ec314db68d6d111f83b96a5d (diff) | |
Fix T57777: Decimate modifier face count does not work
Reviewers: brecht
Differential Revision: https://developer.blender.org/D4106
Diffstat (limited to 'source/blender/modifiers')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_decimate.c | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/source/blender/modifiers/intern/MOD_decimate.c b/source/blender/modifiers/intern/MOD_decimate.c index 0159edd069b..28b38dc638c 100644 --- a/source/blender/modifiers/intern/MOD_decimate.c +++ b/source/blender/modifiers/intern/MOD_decimate.c @@ -45,6 +45,8 @@ #include "BKE_mesh.h" #include "BKE_library.h" +#include "DEG_depsgraph_query.h" + #include "bmesh.h" #include "bmesh_tools.h" @@ -79,6 +81,13 @@ static CustomDataMask requiredDataMask(Object *UNUSED(ob), ModifierData *md) return dataMask; } +static DecimateModifierData *getOriginalModifierData( + const DecimateModifierData *dmd, const ModifierEvalContext *ctx) +{ + Object *ob_orig = DEG_get_original_object(ctx->object); + return (DecimateModifierData *)modifiers_findByName(ob_orig, dmd->modifier.name); +} + static Mesh *applyModifier( ModifierData *md, const ModifierEvalContext *ctx, Mesh *meshData) @@ -187,8 +196,12 @@ static Mesh *applyModifier( MEM_freeN(vweights); } - /* update for display only */ - dmd->face_count = bm->totface; + if (DEG_is_active(ctx->depsgraph)) { + /* update for display only */ + DecimateModifierData *dmd_orig = getOriginalModifierData(dmd, ctx); + dmd_orig->face_count = bm->totface; + } + result = BKE_mesh_from_bmesh_for_eval_nomain(bm, 0); BLI_assert(bm->vtoolflagpool == NULL && bm->etoolflagpool == NULL && |