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
path: root/source
diff options
context:
space:
mode:
authorSybren A. Stüvel <sybren@stuvel.eu>2018-06-01 18:23:46 +0300
committerSybren A. Stüvel <sybren@stuvel.eu>2018-06-01 18:35:26 +0300
commit4fccb8a023c17abf6dae37e80aa835e2de39807b (patch)
treeebb9b200c06a0638aca939deb796413c583d83a9 /source
parente44743736f39246192b49912073a96b4a5cdd2ee (diff)
Boolean modifier: fixed crash when applying the modifier
Diffstat (limited to 'source')
-rw-r--r--source/blender/modifiers/intern/MOD_boolean.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c
index 0cbce903dc6..f2c0baedc01 100644
--- a/source/blender/modifiers/intern/MOD_boolean.c
+++ b/source/blender/modifiers/intern/MOD_boolean.c
@@ -178,7 +178,8 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes
if (!bmd->object)
return mesh;
- mesh_other = BKE_modifier_get_evaluated_mesh_from_evaluated_object(bmd->object, &mesh_other_free);
+ Object *ob_eval = DEG_get_evaluated_object(ctx->depsgraph, bmd->object);
+ mesh_other = BKE_modifier_get_evaluated_mesh_from_evaluated_object(ob_eval, &mesh_other_free);
if (mesh_other) {
Object *object = ctx->object;
Object *other = bmd->object;