diff options
author | Miika Hamalainen <blender@miikah.org> | 2011-08-28 20:36:47 +0400 |
---|---|---|
committer | Miika Hamalainen <blender@miikah.org> | 2011-08-28 20:36:47 +0400 |
commit | 0bb7ddad97fccc7f746a744760f281125482603a (patch) | |
tree | d21179c9e7aa9caf77f87e3edeb56a8a6aeeb495 /source/blender/makesdna | |
parent | c5106fd097cb51a8d9b24cb7ed4759b9ea30051f (diff) |
Dynamic Paint:
* Added option to preview surface wetmap instead of paint.
* Changed default paint color to blue for better visibility.
* Fix: Random sized particles didn't work anymore.
* Fix: Particle initial velocity issues when using canvas substeps and a particle brush.
Diffstat (limited to 'source/blender/makesdna')
-rw-r--r-- | source/blender/makesdna/DNA_dynamicpaint_types.h | 6 | ||||
-rw-r--r-- | source/blender/makesdna/DNA_object_force.h | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/source/blender/makesdna/DNA_dynamicpaint_types.h b/source/blender/makesdna/DNA_dynamicpaint_types.h index e44fec6d69f..4841cf00007 100644 --- a/source/blender/makesdna/DNA_dynamicpaint_types.h +++ b/source/blender/makesdna/DNA_dynamicpaint_types.h @@ -57,6 +57,10 @@ struct PaintSurfaceData; #define MOD_DPAINT_EFFECT_DO_DRIP (1<<1) /* do spread effect */ #define MOD_DPAINT_EFFECT_DO_SHRINK (1<<2) /* do spread effect */ +/* preview_id */ +#define MOD_DPAINT_SURFACE_PREV_PAINT 0 +#define MOD_DPAINT_SURFACE_PREV_WETMAP 1 + typedef struct DynamicPaintSurface { struct DynamicPaintSurface *next, *prev; @@ -76,7 +80,7 @@ typedef struct DynamicPaintSurface { short format, type; short disp_type, image_fileformat; short effect_ui; /* just ui selection box */ - short pad; + short preview_id; /* surface output id to preview */ int flags, effect; int image_resolution, substeps; diff --git a/source/blender/makesdna/DNA_object_force.h b/source/blender/makesdna/DNA_object_force.h index 41ca6ff3042..e2c98b75a57 100644 --- a/source/blender/makesdna/DNA_object_force.h +++ b/source/blender/makesdna/DNA_object_force.h @@ -400,6 +400,7 @@ typedef struct SoftBody { #define PTCACHE_IGNORE_LIBPATH 2048 /* high resolution cache is saved for smoke for backwards compatibility, so set this flag to know it's a "fake" cache */ #define PTCACHE_FAKE_SMOKE (1<<12) +#define PTCACHE_IGNORE_CLEAR (1<<13) /* PTCACHE_OUTDATED + PTCACHE_FRAMES_SKIPPED */ #define PTCACHE_REDO_NEEDED 258 |