Smoke:

a) fixing domain boundaries
b) fixing flow gui (no more velocity there - taken from particles)
c) Outflow available (deletes smoke from scene)
d) deactivating other noise options for now
e) base for render/preview settings 
f) fixing collisions to be working again

1 files changed, 10 insertions, 3 deletions

diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h
index e0871e7038a..0c93b5eb56e 100644
--- a/source/blender/makesdna/DNA_smoke_types.h
+++ b/source/blender/makesdna/DNA_smoke_types.h
@@ -75,17 +75,24 @@ typedef struct SmokeDomainSettings {
 	int max_textures;
 	short noise; /* noise type: wave, curl, anisotropic */
 	short pad2;
-	int pad3;
-	int pad4;
+	int prev_res[3];
+	int prev_maxres;
+	int render_res[3];
+	int render_maxres;
 } SmokeDomainSettings;
 
+
 /* inflow / outflow */
+
+/* type */
+#define MOD_SMOKE_FLOW_TYPE_OUTFLOW (1<<1)
+
 typedef struct SmokeFlowSettings {
 	struct SmokeModifierData *smd; /* for fast RNA access */
 	struct ParticleSystem *psys;
 	float density;
 	float temp; /* delta temperature (temp - ambient temp) */
-	float velocity[3];
+	float velocity[3]; /* UNUSED, velocity taken from particles */
 	float vgrp_heat_scale[2]; /* min and max scaling for vgroup_heat */
 	short vgroup_flow; /* where inflow/outflow happens - red=1=action */
 	short vgroup_density;