[Bf-blender-cvs] [a6815cd3984] temp-fracture-modifier-2.8: fix typo (where only the unmodified mesh was taken into account as operand)
Martin Felke
noreply at git.blender.org
Sun Mar 10 12:36:08 CET 2019
Commit: a6815cd39840268dc2a1718e500f4adfac756615
Author: Martin Felke
Date: Sun Mar 10 12:35:54 2019 +0100
Branches: temp-fracture-modifier-2.8
https://developer.blender.org/rBa6815cd39840268dc2a1718e500f4adfac756615
fix typo (where only the unmodified mesh was taken into account as operand)
===================================================================
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 6e8709d9057..936ac1fc5b5 100644
--- a/source/blender/modifiers/intern/MOD_boolean.c
+++ b/source/blender/modifiers/intern/MOD_boolean.c
@@ -110,7 +110,7 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes
BooleanModifierData *bmd = (BooleanModifierData *) md;
Mesh *result = mesh;
- Mesh *mesh_other;
+ Mesh *mesh_other = NULL;
bool mesh_other_free = false;
if (bmd->object == NULL) {
@@ -118,7 +118,7 @@ static Mesh *applyModifier(ModifierData *md, const ModifierEvalContext *ctx, Mes
}
Object *other = DEG_get_evaluated_object(ctx->depsgraph, bmd->object);
- mesh_other = BKE_modifier_get_evaluated_mesh_from_evaluated_object(other, &mesh_other_free);
+ mesh_other = BKE_modifier_get_evaluated_mesh_from_evaluated_object(other, mesh_other_free);
result = BKE_boolean_operation(mesh, ctx->object, mesh_other, bmd->object, bmd->operation,
bmd->solver, bmd->double_threshold, bmd);
More information about the Bf-blender-cvs
mailing list