Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiika Hamalainen <blender@miikah.org>2011-08-05 13:31:35 +0400
committerMiika Hamalainen <blender@miikah.org>2011-08-05 13:31:35 +0400
commit5467df14cac09a05081db0aa2166306e0f35cbe4 (patch)
tree1363d5ccd0615ad02edf217a8c7c3805d7240548 /source/blender/makesdna/DNA_dynamicpaint_types.h
parentf4c93eb580ede4863ab200b557fba7a8e1308b82 (diff)
Dynamic Paint:
* Added a new "color spread" slider for "spread" effect to adjust how much colors get mixed. * Improved smudge behavior on "wet" paint. * Displace can now be set "incremental". This way it's added on top of previous displace. * Added "displace clamp" setting. You can use it to limit maximum amount of displace. * Fix: velocity data wasn't always initialized, this could lead to no effect at all or crash. * Fix: Vertex color rendering near zero alpha values was still incorrect.
Diffstat (limited to 'source/blender/makesdna/DNA_dynamicpaint_types.h')
-rw-r--r--source/blender/makesdna/DNA_dynamicpaint_types.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_dynamicpaint_types.h b/source/blender/makesdna/DNA_dynamicpaint_types.h
index 7793a0b34d8..4454d447909 100644
--- a/source/blender/makesdna/DNA_dynamicpaint_types.h
+++ b/source/blender/makesdna/DNA_dynamicpaint_types.h
@@ -39,6 +39,7 @@ struct PaintSurfaceData;
#define MOD_DPAINT_PREVIEW (1<<6) /* preview this surface on viewport*/
#define MOD_DPAINT_WAVE_OPEN_BORDERS (1<<7) /* passes waves through mesh edges */
+#define MOD_DPAINT_DISP_INCREMENTAL (1<<8) /* builds displace on top of earlier values */
#define MOD_DPAINT_OUT1 (1<<10) /* output primary surface */
#define MOD_DPAINT_OUT2 (1<<11) /* output secondary surface */
@@ -82,14 +83,13 @@ typedef struct DynamicPaintSurface {
int start_frame, end_frame;
int dry_speed, diss_speed;
- float disp_depth;
+ float disp_clamp;
- float spread_speed, shrink_speed;
+ float spread_speed, color_spread_speed, shrink_speed;
float drip_vel, drip_acc;
/* wave settings */
float wave_damping, wave_speed, wave_timescale, wave_spring;
- float pad_f;
char uvlayer_name[32];
char image_output_path[240];