Smoke:

* New feature: "Dissolve Smoke" - Idea by nudelZ

1 files changed, 12 insertions, 3 deletions

diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h
index 7d64862ba32..c7f49d3ddd2 100644
--- a/source/blender/makesdna/DNA_smoke_types.h
+++ b/source/blender/makesdna/DNA_smoke_types.h
@@ -30,7 +30,10 @@
 #define DNA_SMOKE_TYPES_H
 
 /* flags */
-#define MOD_SMOKE_HIGHRES (1<<1)
+#define MOD_SMOKE_HIGHRES (1<<1) /* compute high resolution */
+#define MOD_SMOKE_DISSOLVE (1<<2) /* let smoke dissolve */
+#define MOD_SMOKE_DISSOLVE_LOG (1<<3) /* using 1/x for dissolve */
+
 /* noise */
 #define MOD_SMOKE_NOISEWAVE (1<<0)
 #define MOD_SMOKE_NOISEFFT (1<<1)
@@ -75,8 +78,8 @@ typedef struct SmokeDomainSettings {
 	int viewsettings;
 	int max_textures;
 	short noise; /* noise type: wave, curl, anisotropic */
-	short pad2;
-	int pad;
+	short diss_percent; 
+	int diss_speed;/* in frames */
 	float strength;
 	struct WTURBULENCE *wt; // WTURBULENCE object, if active
 } SmokeDomainSettings;
@@ -101,6 +104,12 @@ typedef struct SmokeFlowSettings {
 	int pad;
 } SmokeFlowSettings;
 
+/*
+	struct BVHTreeFromMesh *bvh;
+	float mat[4][4];
+	float mat_old[4][4];
+	*/
+
 /* collision objects (filled with smoke) */
 typedef struct SmokeCollSettings {
 	struct SmokeModifierData *smd; /* for fast RNA access */