Commit: c27a16bdd184116c6e2c0855993c94630094e51b
Author: Sebastián Barschkis
Date: Tue Mar 15 11:23:30 2016 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rBc27a16bdd184116c6e2c0855993c94630094e51b
setting up smokedomainsettings for new manta object
===================================================================
M source/blender/makesdna/DNA_smoke_types.h
===================================================================
diff --git a/source/blender/makesdna/DNA_smoke_types.h
b/source/blender/makesdna/DNA_smoke_types.h
index 589e516..8c0efee 100644
--- a/source/blender/makesdna/DNA_smoke_types.h
+++ b/source/blender/makesdna/DNA_smoke_types.h
@@ -90,8 +90,7 @@ typedef struct SmokeSolvers{
typedef struct SmokeDomainSettings {
struct SmokeModifierData *smd; /* for fast RNA access */
- struct FLUID_3D *fluid;
- struct MANTA *manta;
+ struct FLUID_3D *fluid_old;
void *fluid_mutex;
struct Group *fluid_group;
struct Group *eff_group; // UNUSED
@@ -101,7 +100,6 @@ typedef struct SmokeDomainSettings {
struct GPUTexture *tex_wt;
struct GPUTexture *tex_shadow;
struct GPUTexture *tex_flame;
- struct Object *manta_obj;
float *shadow;
/* simulation data */
@@ -164,16 +162,15 @@ typedef struct SmokeDomainSettings {
float flame_smoke_color[3];
/* mantaflow settings */
- int manta_solver_res; /*dimension of manta solver, 2d or 3d*/
-
- /* noise settings */
- float noise_pos_scale;
+ struct MANTA *fluid;
+ struct Object *manta_obj;
+ float noise_pos_scale; /* noise settings */
float noise_time_anim;
-// float padding; /* not used */
+ int manta_solver_res; /* dimension of manta solver, 2d or 3d */
+ char manta_filepath[1024];
+ float mock_var; /* unused */
} SmokeDomainSettings;
-/* inflow / outflow */
-
/* type */
#define MOD_SMOKE_FLOW_TYPE_SMOKE 0
#define MOD_SMOKE_FLOW_TYPE_FIRE 1
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
