[Bf-blender-cvs] [e9624e1f7b6] fluid-mantaflow: Merge commit '68596950550d' into fluid-mantaflow

[Sebastián Barschkis]

Commit: e9624e1f7b6042b4c8e725e0a5c48f64ce395cb0
Author: Sebastián Barschkis
Date:   Mon Sep 4 22:15:05 2017 +0200
Branches: fluid-mantaflow
https://developer.blender.org/rBe9624e1f7b6042b4c8e725e0a5c48f64ce395cb0

Merge commit '68596950550d' into fluid-mantaflow

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



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

diff --cc .gitignore
index ac646b5169f,814b7661bc6..8db1255e5e2
--- a/.gitignore
+++ b/.gitignore
@@@ -19,12 -19,8 +19,11 @@@ Thumbs.d
  ehthumbs.db
  Desktop.ini
  
 +# mac-osx
 +.DS_Store
 +
  # commonly used paths in blender
  /blender.bin
- /user-config.py
  /BUILD_NOTES.txt
  
  # local patches
diff --cc source/blender/blenkernel/intern/smoke.c
index d104bb1c35c,adecea7080c..d3900d356d8
--- a/source/blender/blenkernel/intern/smoke.c
+++ b/source/blender/blenkernel/intern/smoke.c
@@@ -3213,13 -2708,12 +3212,12 @@@ static void smokeModifier_process(Smoke
  		if (scene->r.cfra >= smd->time)
  			smokeModifier_init(smd, ob, scene, dm);
  
 -		if (smd->coll)
 +		if (smd->effec)
  		{
 -			if (smd->coll->dm)
 -				smd->coll->dm->release(smd->coll->dm);
 +			if (smd->effec->dm)
 +				smd->effec->dm->release(smd->effec->dm);
  
 -			smd->coll->dm = CDDM_copy(dm);
 +			smd->effec->dm = CDDM_copy(dm);
- 			DM_ensure_looptri(smd->effec->dm);
  		}
  
  		smd->time = scene->r.cfra;