[Bf-blender-cvs] [c1e503e89a7] blender2.8: Silence false positive warning on boolean modifier

[Dalai Felinto]

Commit: c1e503e89a7c3b463a1ef9fb5845ab6588e3c9a6
Author: Dalai Felinto
Date:   Wed Jun 13 16:01:41 2018 +0200
Branches: blender2.8
https://developer.blender.org/rBc1e503e89a7c3b463a1ef9fb5845ab6588e3c9a6

Silence false positive warning on 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 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);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs