[Bf-blender-cvs] [8830631] fluid-mantaflow: fixed memory leak (liquid mesh was copied but not freed)

Sebastián Barschkis noreply at git.blender.org
Sat Jun 18 19:33:07 CEST 2016


Commit: 88306313edfc3533e691564cc07b3bf1a8e1aba6
Author: Sebastián Barschkis
Date:   Sat Jun 18 19:32:31 2016 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rB88306313edfc3533e691564cc07b3bf1a8e1aba6

fixed memory leak (liquid mesh was copied but not freed)

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

M	source/blender/blenkernel/intern/smoke.c

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

diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index ebf6247..b95b49f 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -3257,7 +3257,7 @@ struct DerivedMesh *smokeModifier_do(SmokeModifierData *smd, Scene *scene, Objec
 		smd->domain->type == MOD_SMOKE_DOMAIN_TYPE_LIQUID)
 	{
 		DerivedMesh *result = createLiquidMesh(smd->domain, dm);
-		return (result) ? CDDM_copy(result) : CDDM_copy(dm);
+		return (result) ? result : CDDM_copy(dm);
 	}
 	else {
 		return CDDM_copy(dm);




More information about the Bf-blender-cvs mailing list