diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-07-02 23:41:31 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2009-07-02 23:41:31 +0400 |
| commit | 093ff8202ced6391a2ef657abe42615672146954 (patch) | |
| tree | 8b65da58becc4ac56bf81ae7d3adab7c86730d15 /source/blender/makesdna | |
| parent | 5a0896e1a3c7f17abd37e3d818585fde8e80ff6d (diff) | |
2.5: Physics Buttons
All kinds of changes to get it ready for UI layouts. This means RNA
and operators should be working correct, but most buttons are still
not actually there yet.
* Added near empty soft body, fluid, field and collision panels,
tweaks to cloth panels.
* Fluid bake works, but without escape or showing any progress.
* Fluid/Softbody/Cloth/Collision can now be both added as modifiers
or in the physics panels.
* Missing: fields & soft body for particles.
* Missing: proper updating softbodies, guess this code still needs
updates after pointcache refactor?
Diffstat (limited to 'source/blender/makesdna')
| -rw-r--r-- | source/blender/makesdna/DNA_object_fluidsim.h | 10 | ||||
| -rw-r--r-- | source/blender/makesdna/DNA_object_force.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/source/blender/makesdna/DNA_object_fluidsim.h b/source/blender/makesdna/DNA_object_fluidsim.h index 66c5baab84b..09288b24c20 100644 --- a/source/blender/makesdna/DNA_object_fluidsim.h +++ b/source/blender/makesdna/DNA_object_fluidsim.h @@ -135,12 +135,12 @@ typedef struct FluidsimSettings { /* ob->fluidsimSettings defines */ #define OB_FLUIDSIM_ENABLE 1 #define OB_FLUIDSIM_DOMAIN 2 -#define OB_FLUIDSIM_FLUID 4 +#define OB_FLUIDSIM_FLUID 4 #define OB_FLUIDSIM_OBSTACLE 8 -#define OB_FLUIDSIM_INFLOW 16 -#define OB_FLUIDSIM_OUTFLOW 32 -#define OB_FLUIDSIM_PARTICLE 64 -#define OB_FLUIDSIM_CONTROL 128 +#define OB_FLUIDSIM_INFLOW 16 +#define OB_FLUIDSIM_OUTFLOW 32 +#define OB_FLUIDSIM_PARTICLE 64 +#define OB_FLUIDSIM_CONTROL 128 #define OB_TYPEFLAG_START 7 #define OB_FSGEO_THIN (1<<(OB_TYPEFLAG_START+1)) diff --git a/source/blender/makesdna/DNA_object_force.h b/source/blender/makesdna/DNA_object_force.h index 88d9894cf7a..32bfc58f56c 100644 --- a/source/blender/makesdna/DNA_object_force.h +++ b/source/blender/makesdna/DNA_object_force.h @@ -271,7 +271,7 @@ typedef struct SoftBody { #define PTCACHE_REDO_NEEDED 258 /* ob->softflag */ -#define OB_SB_ENABLE 1 +#define OB_SB_ENABLE 1 /* deprecated, use modifier */ #define OB_SB_GOAL 2 #define OB_SB_EDGES 4 #define OB_SB_QUADS 8 |