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-10-14 00:00:22 +0400
committerMiika Hamalainen <blender@miikah.org>2011-10-14 00:00:22 +0400
commit8bf78d7f5676520bf6f4241afb88fba506e342f4 (patch)
tree4b488a48bd9e5726111f75b7383874695f634ad1 /source/blender/makesdna/DNA_dynamicpaint_types.h
parent28f77d398e48a8a3d5c2732400c2838b233c27b9 (diff)
Dynamic Paint:
* Fix: Wave "timescale" also changed simulation behavior. Now different timescale values will lead to nearly identical results, just slower or faster. * Added "Displace Factor" setting for vertex displace surfaces. You can use it to adjust final displace strength or use negative values to paint bumps. * Added clamp/map value to wave image sequence output settings. * RNA description tweaking. * General code tweaking.
Diffstat (limited to 'source/blender/makesdna/DNA_dynamicpaint_types.h')
-rw-r--r--source/blender/makesdna/DNA_dynamicpaint_types.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/source/blender/makesdna/DNA_dynamicpaint_types.h b/source/blender/makesdna/DNA_dynamicpaint_types.h
index 2a71831e074..5fe9b657bde 100644
--- a/source/blender/makesdna/DNA_dynamicpaint_types.h
+++ b/source/blender/makesdna/DNA_dynamicpaint_types.h
@@ -91,8 +91,7 @@ typedef struct DynamicPaintSurface {
int flags, effect;
int image_resolution, substeps;
- int start_frame, end_frame;
- int pad;
+ int start_frame, end_frame, pad;
/* initial color */
float init_color[4];
@@ -100,7 +99,7 @@ typedef struct DynamicPaintSurface {
char init_layername[40];
int dry_speed, diss_speed;
- float disp_clamp;
+ float depth_clamp, disp_factor;
float spread_speed, color_spread_speed, shrink_speed;
float drip_vel, drip_acc;
@@ -108,6 +107,8 @@ typedef struct DynamicPaintSurface {
/* wave settings */
float wave_damping, wave_speed, wave_timescale, wave_spring;
+ int pad_;
+
char uvlayer_name[32];
char image_output_path[240];
char output_name[40];