From f8f1cbd17f2b0c624d88ee7f7502e544472b4b6e Mon Sep 17 00:00:00 2001 From: Miika Hamalainen Date: Fri, 8 Jul 2011 11:03:37 +0000 Subject: Dynamic Paint: * Canvas and brush can be now enabled simultaneously. This way it's possible for two canvases to interact. * Added basic anti-aliasing support for vertex surfaces. * 3D-view color preview now works even when there's subsurf modifier after Dynamic Paint in modifier stack. * Added a new brush option to use proximity from object center. * Default surface frame range now use scene's start and end values. * Improved ray checks for volume brushes. * Added new "non-closed" option for volume brushes. This way it's possible to use planar meshes as "volume" brushes with predefined ray direction. * New carrot branch splash image by CGEffex. * Improved brush affection code. * Lots of smaller improvements. * Fixed: Weight paint didn't work with particles. * Fixed: Point cache didn't work for non-wave surfaces anymore since last commit. --- source/blender/makesdna/DNA_dynamicpaint_types.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (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 92626650b87..d51980dbb69 100644 --- a/source/blender/makesdna/DNA_dynamicpaint_types.h +++ b/source/blender/makesdna/DNA_dynamicpaint_types.h @@ -127,12 +127,14 @@ typedef struct DynamicPaintCanvasSettings { #define MOD_DPAINT_RAMP_ALPHA (1<<4) /* only read falloff ramp alpha */ #define MOD_DPAINT_PROX_FACEALIGNED (1<<5) /* do proximity check only in normal dir */ #define MOD_DPAINT_INVERSE_PROX (1<<6) /* inverse proximity painting */ +#define MOD_DPAINT_ACCEPT_NONCLOSED (1<<7) /* allows volume brushes to work with non-closed volumes */ /* collision type */ #define MOD_DPAINT_COL_VOLUME 0 /* paint with mesh volume */ #define MOD_DPAINT_COL_DIST 1 /* paint using distance to mesh surface */ #define MOD_DPAINT_COL_VOLDIST 2 /* use both volume and distance */ #define MOD_DPAINT_COL_PSYS 3 /* use particle system */ +#define MOD_DPAINT_COL_POINT 4 /* use distance to object center point */ /* proximity_falloff */ #define MOD_DPAINT_PRFALL_SHARP 0 /* no-falloff */ @@ -144,6 +146,10 @@ typedef struct DynamicPaintCanvasSettings { #define MOD_DPAINT_WAVEB_FORCE 1 /* act as a force on intersection area */ #define MOD_DPAINT_WAVEB_REFLECT 2 /* obstacle that reflects waves */ +/* brush ray_dir */ +#define MOD_DPAINT_RAY_CANVAS 0 +#define MOD_DPAINT_RAY_ZPLUS 1 + /* Painter settings */ typedef struct DynamicPaintBrushSettings { @@ -168,7 +174,7 @@ typedef struct DynamicPaintBrushSettings { short proximity_falloff; short brush_settings_context; /* ui settings display */ short wave_type; - short pad_s; + short ray_dir; float wave_factor; float pad_f; -- cgit v1.2.3