[Bf-blender-cvs] [3557094] master: Fix T40115: Smoke simulator memory leak with high poly mesh emitter.

[Bastien Montagne]

Commit: 355709432e4a6d2c1888025d46672f5bd16ab815
Author: Bastien Montagne
Date:   Mon May 12 21:30:27 2014 +0200
https://developer.blender.org/rB355709432e4a6d2c1888025d46672f5bd16ab815

Fix T40115: Smoke simulator memory leak with high poly mesh emitter.

Own error, all kudos go to scorpion81 (Martin Felke) for the nvestigation & patch!

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

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

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

diff --git a/source/blender/blenkernel/intern/smoke.c b/source/blender/blenkernel/intern/smoke.c
index 74edd19..55673a3 100644
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@ -1552,8 +1552,7 @@ static void sample_derivedmesh(
 
 static void emit_from_derivedmesh(Object *flow_ob, SmokeDomainSettings *sds, SmokeFlowSettings *sfs, EmissionMap *em, float dt)
 {
-	if (!sfs->dm) return;
-	{
+	if (sfs->dm) {
 		DerivedMesh *dm;
 		int defgrp_index = sfs->vgroup_density - 1;
 		MDeformVert *dvert = NULL;
@@ -1684,10 +1683,17 @@ static void emit_from_derivedmesh(Object *flow_ob, SmokeDomainSettings *sds, Smo
 		free_bvhtree_from_mesh(&treeData);
 		/* restore original mverts */
 		CustomData_set_layer(&dm->vertData, CD_MVERT, mvert_orig);
-		if (mvert)
-			MEM_freeN(mvert);
 
-		if (vert_vel) MEM_freeN(vert_vel);
+		if (mvert) {
+			MEM_freeN(mvert);
+		}
+		if (vert_vel) {
+			MEM_freeN(vert_vel);
+		}
+		if (dm) {
+			dm->needsFree = 1;
+			dm->release(dm);
+		}
 	}
 }