From cb12648656fc001e8c4c6d00df73e52d452f8787 Mon Sep 17 00:00:00 2001 From: Miika Hamalainen Date: Mon, 27 Jun 2011 07:30:58 +0000 Subject: 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. --- source/blender/makesdna/DNA_dynamicpaint_types.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'source/blender/makesdna/DNA_dynamicpaint_types.h') 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]; -- cgit v1.2.3