diff options
| author | Dalai Felinto <dfelinto@gmail.com> | 2018-06-13 17:01:41 +0300 |
|---|---|---|
| committer | Dalai Felinto <dfelinto@gmail.com> | 2018-06-13 17:04:31 +0300 |
| commit | c1e503e89a7c3b463a1ef9fb5845ab6588e3c9a6 (patch) | |
| tree | 99edc0304438a3aef9a1342f008e9bc8906564ea | |
| parent | 1bcf9217eba9a5c10ee72bdd41f59ed94f6614ef (diff) | |
Silence false positive warning on boolean modifier
| -rw-r--r-- | source/blender/modifiers/intern/MOD_boolean.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/modifiers/intern/MOD_boolean.c b/source/blender/modifiers/intern/MOD_boolean.c index f2c0baedc01..a2b300b40dc 100644 --- a/source/blender/modifiers/intern/MOD_boolean.c +++ b/source/blender/modifiers/intern/MOD_boolean.c @@ -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) { BooleanModifierData *bmd = (BooleanModifierData *) md; - Mesh *result; + Mesh *result = mesh; Mesh *mesh_other; bool mesh_other_free; - if (!bmd->object) - return mesh; + if (!bmd->object) { + return result; + } 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); |