Smoke:

* Deleting high res modifier again
* fixing smoke + continue physics drawing
* fixing cache reset when changing dissolve

2 files changed, 15 insertions, 31 deletions

diff --git a/source/blender/makesdna/DNA_modifier_types.h b/source/blender/makesdna/DNA_modifier_types.h
index a4587c34e89..be7452c4ae1 100644
--- a/source/blender/makesdna/DNA_modifier_types.h
+++ b/source/blender/makesdna/DNA_modifier_types.h
@@ -42,7 +42,6 @@ typedef enum ModifierType {
 	eModifierType_Multires,
 	eModifierType_Surface,
 	eModifierType_Smoke,
-	eModifierType_SmokeHR,
 	NUM_MODIFIER_TYPES
 } ModifierType;
 
@@ -255,34 +254,6 @@ typedef struct SmokeModifierData {
 	int type;  /* domain, inflow, outflow, ... */
 } SmokeModifierData;
 
-
-/* noise */
-#define MOD_SMOKE_NOISEWAVE (1<<0)
-#define MOD_SMOKE_NOISEFFT (1<<1)
-#define MOD_SMOKE_NOISECURL (1<<2)
-
-/* flags */
-#define MOD_SMOKE_SHOWHIGHRES (1<<0) /* show high resolution */
-
-typedef struct SmokeHRModifierData {
-	ModifierData modifier;
-
-	struct WTURBULENCE *wt; // WTURBULENCE object, if active
-	struct PointCache *point_cache;	/* definition is in DNA_object_force.h */
-	struct ListBase ptcaches;
-	struct GPUTexture *tex;
-	float *view3d; /* voxel data for display */
-	unsigned int v3dnum; /* number of frame in view3d buffer */
-	float time;
-	float strength;
-	int res[3];
-	int maxres;
-	short noise; /* noise type: wave, curl, anisotropic */
-	short pad;
-	int amplify;
-	int flags;
-} SmokeHRModifierData;
-
 typedef struct DisplaceModifierData {
 	ModifierData modifier;
 
diff --git a/source/blender/makesdna/DNA_smoke_types.h b/source/blender/makesdna/DNA_smoke_types.h
index 2d8b21b86de..542281e1960 100644
--- a/source/blender/makesdna/DNA_smoke_types.h
+++ b/source/blender/makesdna/DNA_smoke_types.h
@@ -32,10 +32,15 @@
 /* flags */
 #define MOD_SMOKE_HIGHRES (1<<1) /* enable high resolution */
 #define MOD_SMOKE_DISSOLVE (1<<2) /* let smoke dissolve */
-#define MOD_SMOKE_DISSOLVE_LOG (1<<3) /* using 1/x for 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)
+#define MOD_SMOKE_NOISECURL (1<<2)
 
 /* viewsettings */
-/* nothing so far */
+#define MOD_SMOKE_SHOWHIGHRES (1<<0) /* show high resolution */
 
 typedef struct SmokeDomainSettings {
 	struct SmokeModifierData *smd; /* for fast RNA access */
@@ -64,6 +69,14 @@ typedef struct SmokeDomainSettings {
 	int diss_speed;/* in frames */
 	struct PointCache *point_cache;	/* definition is in DNA_object_force.h */
 	struct ListBase ptcaches;
+	struct WTURBULENCE *wt; // WTURBULENCE object, if active
+	int pad3;
+	float strength;
+	int res_wt[3];
+	int maxres_wt;
+	short noise; /* noise type: wave, curl, anisotropic */
+	short pad2;
+	int amplify;
 } SmokeDomainSettings;