diff options
| author | Miika Hamalainen <blender@miikah.org> | 2011-06-27 11:30:58 +0400 |
|---|---|---|
| committer | Miika Hamalainen <blender@miikah.org> | 2011-06-27 11:30:58 +0400 |
| commit | cb12648656fc001e8c4c6d00df73e52d452f8787 (patch) | |
| tree | 95e01261ef1c1f5d0e7e4880602858827713921c /source/blender/makesdna/DNA_dynamicpaint_types.h | |
| parent | 40d4f34e82338b98d05595175504120fd98ae680 (diff) | |
Dynamic Paint:
* Fixed memory leak when baking image sequences.
* Fixed sub-steps when brush was controlled by a parent object.
* Added option to select active outputs for paint surfaces.
* Improved color mixing algorithm.
* Improved memory allocation behavior.
* Memory is now freed even in case of errors.
* Removed "initial color" setting, as it's better to adjust color from material.
* "Paint effects" system:
** Converted to use new data structures.
** Works now with any number of surrounding points.
** Re-implemented support for UV-image surfaces.
** Added support for vertex surfaces too.
** Improved color handling.
** Improved movement stability.
** "Drip" effect uses now Blender's force fields instead of just z-directional gravity like before. Now each surface point can have different force influence.
Diffstat (limited to 'source/blender/makesdna/DNA_dynamicpaint_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_dynamicpaint_types.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_dynamicpaint_types.h b/source/blender/makesdna/DNA_dynamicpaint_types.h index faead0a264f..3ec8c9d5fd6 100644 --- a/source/blender/makesdna/DNA_dynamicpaint_types.h +++ b/source/blender/makesdna/DNA_dynamicpaint_types.h @@ -39,6 +39,10 @@ struct PaintSurfaceData; #define MOD_DPAINT_PREVIEW (1<<6) /* preview this surface on viewport*/ +/* image sequence output */ +#define MOD_DPAINT_OUT1 (1<<10) /* output primary surface */ +#define MOD_DPAINT_OUT2 (1<<11) /* output secondary surface */ + /* canvas flags */ #define MOD_DPAINT_PREVIEW_READY (1<<0) /* if viewport preview is ready */ #define MOD_DPAINT_BAKING (1<<1) /* baking an image sequence */ @@ -63,6 +67,7 @@ typedef struct DynamicPaintSurface { struct PaintSurfaceData *data; struct Group *brush_group; + struct EffectorWeights *effector_weights; /* cache */ struct PointCache *pointcache; @@ -76,7 +81,6 @@ typedef struct DynamicPaintSurface { short effect_ui; /* just ui selection box */ short pad; int flags, effect; - float intitial_color[4]; int image_resolution, substeps; int start_frame, end_frame; @@ -84,7 +88,7 @@ typedef struct DynamicPaintSurface { int dry_speed, diss_speed; float disp_depth; - float spread_speed, drip_speed, shrink_speed; + float spread_speed, shrink_speed, pad_f; char uvlayer_name[32]; char image_output_path[240]; |