[Bf-blender-cvs] [4158b7f674b] blender-v2.91-release: Fix T82089 Boolean on empty mesh with collection fails.

[Howard Trickey]

Commit: 4158b7f674bcc05308b50da917798edfdddab469
Author: Howard Trickey
Date:   Sat Oct 31 20:07:00 2020 -0400
Branches: blender-v2.91-release
https://developer.blender.org/rB4158b7f674bcc05308b50da917798edfdddab469

Fix T82089 Boolean on empty mesh with collection fails.

For the fast solver, there was an optimization carried over
from the non-collection case for empty meshes which did not
work in the chained boolean code for collection operands.
Removed that optimization in the collection case.

===================================================================

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 7700c8bbff9..ff06f09d9a6 100644
--- a/source/blender/modifiers/intern/MOD_boolean.c
+++ b/source/blender/modifiers/intern/MOD_boolean.c
@@ -644,33 +644,22 @@ static Mesh *modifyMesh(ModifierData *md, const ModifierEvalContext *ctx, Mesh *
             /* XXX This is utterly non-optimal, we may go from a bmesh to a mesh back to a bmesh!
              * But for 2.90 better not try to be smart here. */
             BKE_mesh_wrapper_ensure_mdata(mesh_operand_ob);
-            /* when one of objects is empty (has got no faces) we could speed up
-             * calculation a bit returning one of objects' derived meshes (or empty one)
-             * Returning mesh is depended on modifiers operation (sergey) */
-            result = get_quick_mesh(object, mesh, operand_ob, mesh_operand_ob, bmd->operation);
-
-            if (result == NULL) {
-              bm = BMD_mesh_bm_create(mesh, object, mesh_operand_ob, operand_ob, &is_flip);
-
-              BMD_mesh_intersection(bm, md, ctx, mesh_operand_ob, object, operand_ob, is_flip);
-
-              /* Needed for multiple objects to work. */
-              BM_mesh_bm_to_me(NULL,
-                               bm,
-                               mesh,
-                               (&(struct BMeshToMeshParams){
-                                   .calc_object_remap = false,
-                               }));
-
-              result = BKE_mesh_from_bmesh_for_eval_nomain(bm, NULL, mesh);
-              BM_mesh_free(bm);
-              result->runtime.cd_dirty_vert |= CD_MASK_NORMAL;
-            }
-            /* if new mesh returned, return it; otherwise there was
-             * an error, so delete the modifier object */
-            if (result == NULL) {
-              BKE_modifier_set_error(md, "Cannot execute boolean operation");
-            }
+
+            bm = BMD_mesh_bm_create(mesh, object, mesh_operand_ob, operand_ob, &is_flip);
+
+            BMD_mesh_intersection(bm, md, ctx, mesh_operand_ob, object, operand_ob, is_flip);
+
+            /* Needed for multiple objects to work. */
+            BM_mesh_bm_to_me(NULL,
+                             bm,
+                             mesh,
+                             (&(struct BMeshToMeshParams){
+                                 .calc_object_remap = false,
+                             }));
+
+            result = BKE_mesh_from_bmesh_for_eval_nomain(bm, NULL, mesh);
+            BM_mesh_free(bm);
+            result->runtime.cd_dirty_vert |= CD_MASK_NORMAL;
           }
         }
       }