diff options
| author | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-06-01 12:49:24 +0300 |
|---|---|---|
| committer | Sybren A. Stüvel <sybren@stuvel.eu> | 2018-06-01 12:50:53 +0300 |
| commit | 0bddf5315fe8051c5f1f962f756fb053c814df65 (patch) | |
| tree | 8f275b8afecbb11b91c4a7e66d239873a08e3610 /source/blender/modifiers/intern/MOD_boolean.c | |
| parent | 8f24d404fe7302aa3be4750ef0f2f4acd064df3e (diff) | |
Fix T55282: Modifiers: Removed unnecessary object evaluation
Diffstat (limited to 'source/blender/modifiers/intern/MOD_boolean.c')
| -rw-r--r-- | source/blender/modifiers/intern/MOD_boolean.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c index 2b6f6cf8920..0cbce903dc6 100644 --- a/source/blender/modifiers/intern/MOD_boolean.c +++ b/source/blender/modifiers/intern/MOD_boolean.c @@ -180,16 +180,16 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes mesh_other = BKE_modifier_get_evaluated_mesh_from_evaluated_object(bmd->object, &mesh_other_free); if (mesh_other) { - Object *object_eval = DEG_get_evaluated_object(ctx->depsgraph, ctx->object); - Object *other_eval = DEG_get_evaluated_object(ctx->depsgraph, bmd->object); + Object *object = ctx->object; + Object *other = bmd->object; /* when one of objects is empty (has got no faces) we could speed up * calculation a bit returning one of objects' derived meshes (or empty one) * Returning mesh is depended on modifiers operation (sergey) */ - result = get_quick_mesh(object_eval, mesh, other_eval, mesh_other, bmd->operation); + result = get_quick_mesh(object, mesh, other, mesh_other, bmd->operation); if (result == NULL) { - const bool is_flip = (is_negative_m4(object_eval->obmat) != is_negative_m4(other_eval->obmat)); + const bool is_flip = (is_negative_m4(object->obmat) != is_negative_m4(other->obmat)); BMesh *bm; const BMAllocTemplate allocsize = BMALLOC_TEMPLATE_FROM_ME(mesh, mesh_other); @@ -236,8 +236,8 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes float imat[4][4]; float omat[4][4]; - invert_m4_m4(imat, object_eval->obmat); - mul_m4_m4m4(omat, imat, other_eval->obmat); + invert_m4_m4(imat, object->obmat); + mul_m4_m4m4(omat, imat, other->obmat); BMVert *eve; i = 0; @@ -259,11 +259,11 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes negate_m3(nmat); } - const short ob_src_totcol = other_eval->totcol; + const short ob_src_totcol = other->totcol; short *material_remap = BLI_array_alloca(material_remap, ob_src_totcol ? ob_src_totcol : 1); /* Using original (not evaluated) object here since we are writing to it. */ - BKE_material_remap_object_calc(ctx->object, other_eval, material_remap); + BKE_material_remap_object_calc(ctx->object, other, material_remap); BMFace *efa; i = 0; |