[Bf-blender-cvs] [9406a1f1957] blender2.8: Fix cannot apply boolean modifier
Dalai Felinto
noreply at git.blender.org
Thu May 24 15:26:37 CEST 2018
Commit: 9406a1f19570cbd60ca45fa20b93cc05bb1fa4fc
Author: Dalai Felinto
Date: Thu May 24 15:26:02 2018 +0200
Branches: blender2.8
https://developer.blender.org/rB9406a1f19570cbd60ca45fa20b93cc05bb1fa4fc
Fix cannot apply boolean modifier
===================================================================
M source/blender/modifiers/intern/MOD_boolean.c
===================================================================
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;
More information about the Bf-blender-cvs
mailing list