diff options
author | Miika Hamalainen <blender@miikah.org> | 2011-09-05 20:04:15 +0400 |
---|---|---|
committer | Miika Hamalainen <blender@miikah.org> | 2011-09-05 20:04:15 +0400 |
commit | 79ef35889f850aa7173800bcf67918c14f3b1291 (patch) | |
tree | 198618ec4a98e50a1123ea94c093788413ca18dc /source/blender/makesdna/DNA_dynamicpaint_types.h | |
parent | 39b66f9ad4239865f25853eea3cbf48e4853a266 (diff) |
Dynamic Paint:
* Added "Initial Color" setting for surfaces. You can for example set color from UV mapped texture or from vertex colors.
* Added clamping option for "wave" brushes.
* Merged smudge and drip adjacency search code. This fixes some issues with drip effect and makes code easier to maintain.
* Some adjustments to the bounding box generation code.
* OpenMP is now completely disabled if no compile flag is set.
* Wetness values are now properly clamped on vertex surfaces. No more black dots on >1.0 wetness.
* Textured brushes now use same function calls as internal renderer, instead of modified duplicates.
* Moved operator code to editors/physics/.
* Re-enabled some particle brush optimizations.
* Fixed sometimes incorrect volume brush influence.
* Fixed possible crash when using a brush that uses "Voxel Data" texture simultaneously with material preview or render.
* Fixed texture mapping issues for "Object Center" brush.
* Fixed possible crash/corruption when duplicating brush object that uses color ramps.
* Other tweaking and code cleanup.
Diffstat (limited to 'source/blender/makesdna/DNA_dynamicpaint_types.h')
-rw-r--r-- | source/blender/makesdna/DNA_dynamicpaint_types.h | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/source/blender/makesdna/DNA_dynamicpaint_types.h b/source/blender/makesdna/DNA_dynamicpaint_types.h index 4841cf00007..2dbd1a50001 100644 --- a/source/blender/makesdna/DNA_dynamicpaint_types.h +++ b/source/blender/makesdna/DNA_dynamicpaint_types.h @@ -61,6 +61,12 @@ struct PaintSurfaceData; #define MOD_DPAINT_SURFACE_PREV_PAINT 0 #define MOD_DPAINT_SURFACE_PREV_WETMAP 1 +/* init_color_type */ +#define MOD_DPAINT_INITIAL_NONE 0 +#define MOD_DPAINT_INITIAL_COLOR 1 +#define MOD_DPAINT_INITIAL_TEXTURE 2 +#define MOD_DPAINT_INITIAL_VERTEXCOLOR 3 + typedef struct DynamicPaintSurface { struct DynamicPaintSurface *next, *prev; @@ -81,6 +87,7 @@ typedef struct DynamicPaintSurface { short disp_type, image_fileformat; short effect_ui; /* just ui selection box */ short preview_id; /* surface output id to preview */ + short init_color_type, pad_s; int flags, effect; int image_resolution, substeps; @@ -89,6 +96,12 @@ typedef struct DynamicPaintSurface { int dry_speed, diss_speed; float disp_clamp; + /* initial color */ + float init_color[4]; + struct Tex *init_texture; + char init_layername[40]; + int pad; + float spread_speed, color_spread_speed, shrink_speed; float drip_vel, drip_acc; @@ -188,9 +201,8 @@ typedef struct DynamicPaintBrushSettings { short wave_type; short ray_dir; - float wave_factor; + float wave_factor, wave_clamp; float max_velocity, smudge_strength; - float pad; } DynamicPaintBrushSettings; #endif |