archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

Silence false positive warning on boolean modifier

Browse Source
This commit is contained in:
Dalai Felinto
2018-06-13 16:01:41 +02:00
parent 1bcf9217eb
commit c1e503e89a
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
source/blender/modifiers/intern/MOD_boolean.c
View File

@@ -170,13 +170,14 @@ static int bm_face_isect_pair(BMFace *f, void *UNUSED(user_data))
static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh) static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mesh *mesh)
{ {
BooleanModifierData *bmd = (BooleanModifierData *) md; BooleanModifierData *bmd = (BooleanModifierData *) md;
Mesh *result; Mesh *result = mesh;
Mesh *mesh_other; Mesh *mesh_other;
bool mesh_other_free; bool mesh_other_free;
if (!bmd->object) if (!bmd->object) {
return mesh; return result;
}
Object *ob_eval = DEG_get_evaluated_object(ctx->depsgraph, bmd->object); 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); mesh_other = BKE_modifier_get_evaluated_mesh_from_evaluated_object(ob_eval, &mesh_other_free);