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.

1 files changed, 9 insertions, 1 deletions

diff --git a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
index 21f220b27f6..4c59ed85639 100644
--- a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
+++ b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py
@@ -183,8 +183,13 @@ class PHYSICS_PT_dp_advanced_canvas(PhysicButtonsPanel, bpy.types.Panel):
         
         # per type settings
         if (surface.surface_type == "DISPLACE"):
-            layout.prop(surface, "disp_clamp")
             layout.prop(surface, "incremental_disp")
+            if (surface.surface_format == "VERTEX"):
+                split = layout.split()
+                col = split.column()
+                col.prop(surface, "depth_clamp")
+                col = split.column()
+                col.prop(surface, "disp_factor")
             
         if (surface.surface_type == "WAVE"):
             layout.prop(surface, "wave_open_borders")
@@ -284,6 +289,9 @@ class PHYSICS_PT_dp_canvas_output(PhysicButtonsPanel, bpy.types.Panel):
                 col.prop(surface, "output_name", text="Filename: ")
                 if (surface.surface_type == "DISPLACE"):
                     col.prop(surface, "disp_type", text="Displace Type")
+                    col.prop(surface, "depth_clamp")
+                if (surface.surface_type == "WAVE"):
+                    col.prop(surface, "depth_clamp", text="Wave Clamp")
             
             layout.separator()
             layout.operator("dpaint.bake", text="Bake Image Sequence", icon='MOD_DYNAMICPAINT')