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:
authorDalai Felinto <dfelinto@gmail.com>2018-05-24 16:26:02 +0300
committerDalai Felinto <dfelinto@gmail.com>2018-05-24 16:26:31 +0300
commit9406a1f19570cbd60ca45fa20b93cc05bb1fa4fc (patch)
tree11788183242c4eb41d9f3798d3640ab943fc2dea /source/blender/modifiers/intern
parentd64fbe94568e5ea888e34872d31689f058f6a1a8 (diff)
Fix cannot apply boolean modifier
Diffstat (limited to 'source/blender/modifiers/intern')
-rw-r--r--source/blender/modifiers/intern/MOD_boolean.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c
index ebe5aacd888..887fa75e04d 100644
--- a/source/blender/modifiers/intern/MOD_boolean.c
+++ b/source/blender/modifiers/intern/MOD_boolean.c
@@ -56,6 +56,8 @@
#include "DNA_mesh_types.h"
#include "DNA_meshdata_types.h"
+#include "DEG_depsgraph_query.h"
+
#include "MEM_guardedalloc.h"
#include "bmesh.h"
@@ -173,7 +175,8 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes
if (!bmd->object)
return mesh;
- mesh_other = BKE_modifier_get_evaluated_mesh_from_object(bmd->object, ctx->flag);
+ Object *other_eval = DEG_get_evaluated_object(ctx->depsgraph, bmd->object);
+ mesh_other = BKE_modifier_get_evaluated_mesh_from_object(other_eval, ctx->flag);
if (mesh_other) {
Mesh *result;